diff options
Diffstat (limited to 'databases/mongodb/patches/patch-SConstruct')
| -rw-r--r-- | databases/mongodb/patches/patch-SConstruct | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/databases/mongodb/patches/patch-SConstruct b/databases/mongodb/patches/patch-SConstruct index 58a50996f3e..9a99abe6f7c 100644 --- a/databases/mongodb/patches/patch-SConstruct +++ b/databases/mongodb/patches/patch-SConstruct @@ -1,7 +1,7 @@ -$NetBSD: patch-SConstruct,v 1.3 2016/02/12 03:37:24 ryoon Exp $ +$NetBSD: patch-SConstruct,v 1.4 2016/06/17 11:51:08 fhajny Exp $ Add support for NetBSD/Dragonfly, fix locations. ---- SConstruct.orig 2016-01-05 18:31:44.000000000 +0000 +--- SConstruct.orig 2016-06-02 14:46:27.000000000 +0000 +++ SConstruct @@ -40,8 +40,12 @@ def get_running_os_name(): running_os = os.sys.platform @@ -25,16 +25,7 @@ Add support for NetBSD/Dragonfly, fix locations. for p in os_list_to_check: if p == 'posix' and target_os in posix_os_list: -@@ -754,7 +758,7 @@ def printLocalInfo(): - - printLocalInfo() - --boostLibs = [ "thread" , "filesystem" , "program_options", "system", "regex", "chrono" ] -+boostLibs = [ "thread" , "filesystem" , "program_options", "system", "regex", "chrono" ] - - onlyServer = len( COMMAND_LINE_TARGETS ) == 0 or ( len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) in [ "mongod" , "mongos" , "test" ] ) - -@@ -815,6 +819,7 @@ envDict = dict(BUILD_ROOT=buildDir, +@@ -831,6 +835,7 @@ envDict = dict(BUILD_ROOT=buildDir, INSTALL_DIR=installDir, CONFIG_HEADER_DEFINES={}, LIBDEPS_TAG_EXPANSIONS=[], @@ -42,7 +33,7 @@ Add support for NetBSD/Dragonfly, fix locations. ) env = Environment(variables=env_vars, **envDict) -@@ -925,7 +930,9 @@ def CheckForProcessor(context, which_arc +@@ -968,7 +973,9 @@ def CheckForProcessor(context, which_arc os_macros = { "windows": "_WIN32", "solaris": "__sun", @@ -52,7 +43,7 @@ Add support for NetBSD/Dragonfly, fix locations. "openbsd": "__OpenBSD__", "osx": "__APPLE__", "linux": "__linux__", -@@ -1184,7 +1191,7 @@ if env['_LIBDEPS'] == '$_LIBDEPS_OBJS': +@@ -1233,7 +1240,7 @@ if env['_LIBDEPS'] == '$_LIBDEPS_OBJS': libdeps.setup_environment(env, emitting_shared=(link_model.startswith("dynamic"))) @@ -61,7 +52,7 @@ Add support for NetBSD/Dragonfly, fix locations. env['LINK_LIBGROUP_START'] = '-Wl,--start-group' env['LINK_LIBGROUP_END'] = '-Wl,--end-group' env['LINK_WHOLE_ARCHIVE_START'] = '-Wl,--whole-archive' -@@ -1212,10 +1219,24 @@ if env.TargetOSIs('linux'): +@@ -1261,10 +1268,24 @@ if env.TargetOSIs('linux'): elif env.TargetOSIs('solaris'): env.Append( LIBS=["socket","resolv","lgrp"] ) @@ -86,7 +77,7 @@ Add support for NetBSD/Dragonfly, fix locations. elif env.TargetOSIs('openbsd'): env.Append( LIBS=[ "kvm" ] ) -@@ -1382,8 +1403,11 @@ if env.TargetOSIs('posix'): +@@ -1432,8 +1453,11 @@ if env.TargetOSIs('posix'): if not has_option("disable-warnings-as-errors"): env.Append( CCFLAGS=["-Werror"] ) @@ -98,7 +89,7 @@ Add support for NetBSD/Dragonfly, fix locations. # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program # startup. -@@ -2245,6 +2269,7 @@ def doConfigure(myenv): +@@ -2406,6 +2430,7 @@ def doConfigure(myenv): # permit more than four parameters. "BOOST_THREAD_DONT_PROVIDE_VARIADIC_THREAD", "BOOST_SYSTEM_NO_DEPRECATED", @@ -106,7 +97,7 @@ Add support for NetBSD/Dragonfly, fix locations. ] ) -@@ -2311,7 +2336,7 @@ def doConfigure(myenv): +@@ -2472,7 +2497,7 @@ def doConfigure(myenv): myenv.ConfError("Couldn't find SASL header/libraries") # requires ports devel/libexecinfo to be installed |