Attachment 194840 Details for Bug 217152 – svn-diff-xorp

[patch] svn-diff-xorp

svn-diff-xorp (text/plain), 4.09 KB, created by Walter Schwarzenfeld on 2018-07-02 18:03:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2018-07-02 18:03:24 UTC

Size: 4.09 KB

patch

obsolete

>Index: files/patch-SConstruct
>===================================================================
>--- files/patch-SConstruct	(revision 473014)
>+++ files/patch-SConstruct	(working copy)
>@@ -1,35 +1,40 @@
>---- SConstruct.orig	2012-01-11 17:56:10 UTC
>+--- SConstruct.orig	2018-06-22 03:36:59 UTC
> +++ SConstruct
>-@@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):
>+@@ -853,18 +853,6 @@ if env['enable_boost']:
>  
>- # XXX TODO: Make initial CPPPATH/LIBPATH derive from
>- # autodetected host system *or* command line.
>--#env = Environment(
>--#		  TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
>--#		           'TOOL_SUBST'],
>--#		  ENV = os.environ,
>--#		  BUILDDIR = builddir,
>--#		  CPPPATH=['/usr/local/include', '$BUILDDIR'],
>--#		  LIBPATH=['usr/lib', '/usr/local/lib'],
>--#		  variables = vars)
>--
>- env = Environment(
>- 		  TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
>- 		           'TOOL_SUBST'],
>- 		  ENV = os.environ,
>- 		  BUILDDIR = builddir,
>--		  CPPPATH=['$BUILDDIR'],
>--		  LIBPATH=['usr/lib'],
>-+		  CPPPATH=['/usr/local/include', '$BUILDDIR'],
>-+		  LIBPATH=['usr/lib', '/usr/local/lib'],
>- 		  variables = vars)
>+ # Some platforms have alignment warnings that cannot easily be
>+ # fixed, so we can't enable Werror for them.
>+-if ((build != "i386-pc-mingw32") and
>+-    (host_cpu == "i686" or
>+-     host_cpu == "i386" or
>+-     host_cpu == "x86_64")):
>+-        env.AppendUnique(CFLAGS = [
>+-	        '-Werror',
>+-		])
>+-	env.AppendUnique(CXXFLAGS = [
>+-		'-Werror',
>+-		])
>+-else:
>+-	print "WARNING:  Detected funky platform, will not enable -Werror compile option: ", host_cpu
>+ 	
>  
>- prefix = env['prefix']
>-@@ -880,6 +871,7 @@ env.AppendUnique(CFLAGS = [
>+ # NOTE: gcc specific flags.
>+@@ -874,9 +862,7 @@ env.AppendUnique(CFLAGS = [
>+     '-Wwrite-strings',
>+     '-Wbad-function-cast',
>+     '-Wmissing-prototypes',
>+-    '-Wcast-qual',
>+     '-Wmissing-declarations',
>+-    '-Wpointer-arith',
>      '-Wcast-align',
>      '-Wstrict-prototypes',
>      '-Wnested-externs',
>-+    '-Wno-unused-function',
>-     '-pipe',
>-     ])
>- 
>+@@ -887,8 +873,6 @@ env.AppendUnique(CXXFLAGS = [
>+     '-W',
>+     '-Wall',
>+     '-Wwrite-strings',
>+-    '-Wcast-qual',
>+-    '-Wpointer-arith',
>+     '-Wcast-align',
>+     '-Woverloaded-virtual',
>+     '-ftemplate-depth-25',
>Index: files/patch-configure.in
>===================================================================
>--- files/patch-configure.in	(nonexistent)
>+++ files/patch-configure.in	(working copy)
>@@ -0,0 +1,20 @@
>+--- ../other/lookup/configure.in.orig	2018-06-22 03:38:59 UTC
>++++ ../other/lookup/configure.in
>+@@ -60,8 +60,8 @@ if test "${GCC}" = "yes" ; then
>+         dnl       create a warning for gcc 2.95.3
>+         dnl     - On Linux RedHat 7.2, #elif creates a warning for gcc 2.96
>+         dnl
>+-        CPARANOIDFLAGS="-W -Wall -Wwrite-strings -Wbad-function-cast -Wmissing-prototypes -Wcast-qual -Wmissing-declarations -Werror -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wnested-externs -Wnon-const-format"
>+-        CXXPARANOIDFLAGS="-W -Wall -Wwrite-strings -Wmissing-prototypes -Wcast-qual -Werror -Wpointer-arith -Wcast-align -Wstrict-prototypes -Woverloaded-virtual -Wnon-const-format -Wtraditional"
>++        CPARANOIDFLAGS="-W -Wall -Wwrite-strings -Wbad-function-cast -Wmissing-prototypes -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wstrict-prototypes -Wnested-externs -Wnon-const-format"
>++        CXXPARANOIDFLAGS="-W -Wall -Wwrite-strings -Wmissing-prototypes -Wcast-align -Wstrict-prototypes -Woverloaded-virtual -Wnon-const-format -Wtraditional"
>+         XR_TRY_ADD_CFLAGS($CPARANOIDFLAGS)
>+         XR_TRY_ADD_CXXFLAGS($CXXPARANOIDFLAGS)
>+         XR_TRY_ADD_CXXFLAGS("-ftemplate-depth-20")
>+@@ -120,4 +120,4 @@ AC_OUTPUT(
>+ 	src/Makefile
>+ ,
>+ 	echo timestamp > stamp-h
>+-)
>+\ No newline at end of file
>++)
>
>Property changes on: files/patch-configure.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 217152: 194840 | 194845 | 195056 | 195057 | 195059 | 195071 | 195073 | 195086 | 195088 | 195089 | 195094 | 195125