View | Details | Raw Unified | Return to bug 217152 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-SConstruct (-29 / +34 lines)
Lines 1-35 Link Here
1 
--- SConstruct.orig	2012-01-11 17:56:10 UTC
 1 
--- SConstruct.orig	2018-06-22 03:36:59 UTC
2 
+++ SConstruct
 2 
+++ SConstruct
3 
@@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):
 3 
@@ -853,18 +853,6 @@ if env['enable_boost']:
4
4
5 
 # XXX TODO: Make initial CPPPATH/LIBPATH derive from
 5 
 # Some platforms have alignment warnings that cannot easily be
6 
 # autodetected host system *or* command line.
 6 
 # fixed, so we can't enable Werror for them.
7 
-#env = Environment(
 7 
-if ((build != "i386-pc-mingw32") and
8 
-#		  TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
 8 
-    (host_cpu == "i686" or
9 
-#		           'TOOL_SUBST'],
 9 
-     host_cpu == "i386" or
10 
-#		  ENV = os.environ,
 10 
-     host_cpu == "x86_64")):
11 
-#		  BUILDDIR = builddir,
 11 
-        env.AppendUnique(CFLAGS = [
12 
-#		  CPPPATH=['/usr/local/include', '$BUILDDIR'],
 12 
-	        '-Werror',
13 
-#		  LIBPATH=['usr/lib', '/usr/local/lib'],
 13 
-		])
14 
-#		  variables = vars)
 14 
-	env.AppendUnique(CXXFLAGS = [
15 
-
 15 
-		'-Werror',
16 
 env = Environment(
 16 
-		])
17 
 		  TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
 17 
-else:
18 
 		           'TOOL_SUBST'],
 18 
-	print "WARNING:  Detected funky platform, will not enable -Werror compile option: ", host_cpu
19 
 		  ENV = os.environ,
 19
20 
 		  BUILDDIR = builddir,
21 
-		  CPPPATH=['$BUILDDIR'],
22 
-		  LIBPATH=['usr/lib'],
23 
+		  CPPPATH=['/usr/local/include', '$BUILDDIR'],
24 
+		  LIBPATH=['usr/lib', '/usr/local/lib'],
25 
 		  variables = vars)
26
20
27 
 prefix = env['prefix']
 21 
 # NOTE: gcc specific flags.
28 
@@ -880,6 +871,7 @@ env.AppendUnique(CFLAGS = [
 22 
@@ -874,9 +862,7 @@ env.AppendUnique(CFLAGS = [
23 
     '-Wwrite-strings',
24 
     '-Wbad-function-cast',
25 
     '-Wmissing-prototypes',
26 
-    '-Wcast-qual',
27 
     '-Wmissing-declarations',
28 
-    '-Wpointer-arith',
29 
     '-Wcast-align',
 29 
     '-Wcast-align',
30 
     '-Wstrict-prototypes',
 30 
     '-Wstrict-prototypes',
31 
     '-Wnested-externs',
 31 
     '-Wnested-externs',
32 
+    '-Wno-unused-function',
 32 
@@ -887,8 +873,6 @@ env.AppendUnique(CXXFLAGS = [
33 
     '-pipe',
 33 
     '-W',
34 
     ])
 34 
     '-Wall',
35
35 
     '-Wwrite-strings',
36 
-    '-Wcast-qual',
37 
-    '-Wpointer-arith',
38 
     '-Wcast-align',
39 
     '-Woverloaded-virtual',
40 
     '-ftemplate-depth-25',
(-)files/patch-configure.in (+20 lines)
Line 0 Link Here
1 
--- ../other/lookup/configure.in.orig	2018-06-22 03:38:59 UTC
2 
+++ ../other/lookup/configure.in
3 
@@ -60,8 +60,8 @@ if test "${GCC}" = "yes" ; then
4 
         dnl       create a warning for gcc 2.95.3
5 
         dnl     - On Linux RedHat 7.2, #elif creates a warning for gcc 2.96
6 
         dnl
7 
-        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"
8 
-        CXXPARANOIDFLAGS="-W -Wall -Wwrite-strings -Wmissing-prototypes -Wcast-qual -Werror -Wpointer-arith -Wcast-align -Wstrict-prototypes -Woverloaded-virtual -Wnon-const-format -Wtraditional"
9 
+        CPARANOIDFLAGS="-W -Wall -Wwrite-strings -Wbad-function-cast -Wmissing-prototypes -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wstrict-prototypes -Wnested-externs -Wnon-const-format"
10 
+        CXXPARANOIDFLAGS="-W -Wall -Wwrite-strings -Wmissing-prototypes -Wcast-align -Wstrict-prototypes -Woverloaded-virtual -Wnon-const-format -Wtraditional"
11 
         XR_TRY_ADD_CFLAGS($CPARANOIDFLAGS)
12 
         XR_TRY_ADD_CXXFLAGS($CXXPARANOIDFLAGS)
13 
         XR_TRY_ADD_CXXFLAGS("-ftemplate-depth-20")
14 
@@ -120,4 +120,4 @@ AC_OUTPUT(
15 
 	src/Makefile
16 
 ,
17 
 	echo timestamp > stamp-h
18 
-)
19 
\ No newline at end of file
20 
+)

Return to bug 217152