diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2018-07-14 14:10:29 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2018-07-14 14:10:29 +0000 |
| commit | aed832b2a9e1556e6b98247ad6fb50585b81bd0b (patch) | |
| tree | a37b188ef0029204ca784fa6924c5f1618f21d1e /net/xorp/files/patch-SConstruct | |
| parent | - Update to 1.1.0 (diff) | |
net/xorp: fix build
PR: 217152
Submitted by: Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>
Reported by: O. Hartmann <ohartmann@walstatt.org>
Approved by: hrs (maintainer timeout)
Notes
Notes:
svn path=/head/; revision=474640
Diffstat (limited to 'net/xorp/files/patch-SConstruct')
| -rw-r--r-- | net/xorp/files/patch-SConstruct | 50 |
1 files changed, 47 insertions, 3 deletions
diff --git a/net/xorp/files/patch-SConstruct b/net/xorp/files/patch-SConstruct index 100b45bb6315..c90d20c9f08e 100644 --- a/net/xorp/files/patch-SConstruct +++ b/net/xorp/files/patch-SConstruct @@ -1,4 +1,4 @@ ---- SConstruct.orig 2012-01-11 17:56:10 UTC +--- SConstruct.orig 2018-07-11 16:37:51 UTC +++ SConstruct @@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0): @@ -25,11 +25,55 @@ variables = vars) prefix = env['prefix'] -@@ -880,6 +871,7 @@ env.AppendUnique(CFLAGS = [ - '-Wcast-align', +@@ -853,20 +844,6 @@ if env['enable_boost']: + + # 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 +- +- + # NOTE: gcc specific flags. + env.AppendUnique(CFLAGS = [ + '-W', +@@ -874,12 +851,14 @@ env.AppendUnique(CFLAGS = [ + '-Wwrite-strings', + '-Wbad-function-cast', + '-Wmissing-prototypes', +- '-Wcast-qual', ++ '-Wno-cast-qual', ++ '-Wno-sign-compare', + '-Wmissing-declarations', + '-Wpointer-arith', +- '-Wcast-align', '-Wstrict-prototypes', '-Wnested-externs', + '-Wno-unused-function', ++ '-Wno-unused-parameter', + '-pipe', + ]) + +@@ -887,11 +866,10 @@ env.AppendUnique(CXXFLAGS = [ + '-W', + '-Wall', + '-Wwrite-strings', +- '-Wcast-qual', ++ '-Wno-cast-qual', ++ '-Wno-sign-compare', + '-Wpointer-arith', +- '-Wcast-align', + '-Woverloaded-virtual', +- '-ftemplate-depth-25', '-pipe', ]) |