summaryrefslogtreecommitdiff
path: root/net/xorp/files/patch-SConstruct
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2015-09-07 19:04:23 +0000
committerHiroki Sato <hrs@FreeBSD.org>2015-09-07 19:04:23 +0000
commit0a0906700b6b1255937f7e237087ce6c123cbea0 (patch)
tree6711200ddde593c7d4ae084b5a2174061c820fe6 /net/xorp/files/patch-SConstruct
parentAdd net/smcroute, a simple, static multicast routing tool. (diff)
- Use USE_GITHUB.
- Add USE_LDCONFIG when SHARED is enabled. - Use OPTIONS_SUB. - Use {opt}_FOO wherever possible. - Normalize patch files. - Take maintainership.
Notes
Notes: svn path=/head/; revision=396340
Diffstat (limited to 'net/xorp/files/patch-SConstruct')
-rw-r--r--net/xorp/files/patch-SConstruct27
1 files changed, 22 insertions, 5 deletions
diff --git a/net/xorp/files/patch-SConstruct b/net/xorp/files/patch-SConstruct
index 826dc700564d..f64ab642719b 100644
--- a/net/xorp/files/patch-SConstruct
+++ b/net/xorp/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- ./SConstruct.orig 2012-01-11 17:46:45.000000000 +0000
-+++ ./SConstruct 2014-02-26 21:17:13.000000000 +0000
-@@ -162,22 +162,13 @@
+--- SConstruct.orig 2012-01-11 17:56:10 UTC
++++ SConstruct
+@@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):
# XXX TODO: Make initial CPPPATH/LIBPATH derive from
# autodetected host system *or* command line.
@@ -20,8 +20,25 @@
BUILDDIR = builddir,
- CPPPATH=['$BUILDDIR'],
- LIBPATH=['usr/lib'],
-+ CPPPATH=['%%LOCALBASE%%/include', '$BUILDDIR'],
-+ LIBPATH=['usr/lib', '%%LOCALBASE%%/lib'],
++ CPPPATH=['/usr/local/include', '$BUILDDIR'],
++ LIBPATH=['usr/lib', '/usr/local/lib'],
variables = vars)
prefix = env['prefix']
+@@ -858,13 +849,13 @@ if ((build != "i386-pc-mingw32") and
+ host_cpu == "i386" or
+ host_cpu == "x86_64")):
+ env.AppendUnique(CFLAGS = [
+- '-Werror',
++ '-Werror -Wno-unused-function',
+ ])
+ env.AppendUnique(CXXFLAGS = [
+- '-Werror',
++ '-Werror -Wno-unused-function',
+ ])
+ else:
+- print "WARNING: Detected funky platform, will not enable -Werror compile option: ", host_cpu
++ print "WARNING: Detected funky platform, will not enable -Werror -Wno-unused-function compile option: ", host_cpu
+
+
+ # NOTE: gcc specific flags.