Sun Oct 8 22:17:07 2017 UTC ()
mongodb: fix scons-3.0 compatibility issues


(tnn)
diff -r1.20 -r1.21 pkgsrc/databases/mongodb/distinfo
diff -r1.6 -r1.7 pkgsrc/databases/mongodb/patches/patch-SConstruct
diff -r0 -r1.1 pkgsrc/databases/mongodb/patches/patch-src_mongo_installer_msi_SConscript
diff -r1.4 -r1.5 pkgsrc/databases/mongodb/patches/patch-src_third__party_wiredtiger_SConscript
cvs diff -r1.20 -r1.21 pkgsrc/databases/mongodb/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mongodb/distinfo 2017/07/11 19:35:51 1.20
+++ pkgsrc/databases/mongodb/distinfo 2017/10/08 22:17:06 1.21
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1$NetBSD: distinfo,v 1.20 2017/07/11 19:35:51 joerg Exp $ 1$NetBSD: distinfo,v 1.21 2017/10/08 22:17:06 tnn Exp $
2 2
3SHA1 (mongodb-src-r3.4.4.tar.gz) = 6f9f2d8a3c1c2f4089fd03f8be0b86ff0431d955 3SHA1 (mongodb-src-r3.4.4.tar.gz) = 6f9f2d8a3c1c2f4089fd03f8be0b86ff0431d955
4RMD160 (mongodb-src-r3.4.4.tar.gz) = 2a65f380204a92762ceea2be35dbe2c671e106f6 4RMD160 (mongodb-src-r3.4.4.tar.gz) = 2a65f380204a92762ceea2be35dbe2c671e106f6
5SHA512 (mongodb-src-r3.4.4.tar.gz) = dbae89b49c363e7258021cd31385e4449bfdfdfd5adfcb1683e4431372731e58ec33bf8f7576d2d52659a52461bd6a32fbc67d5c6e36d52184ec1aabb345d940 5SHA512 (mongodb-src-r3.4.4.tar.gz) = dbae89b49c363e7258021cd31385e4449bfdfdfd5adfcb1683e4431372731e58ec33bf8f7576d2d52659a52461bd6a32fbc67d5c6e36d52184ec1aabb345d940
6Size (mongodb-src-r3.4.4.tar.gz) = 39867133 bytes 6Size (mongodb-src-r3.4.4.tar.gz) = 39867133 bytes
7SHA1 (patch-SConstruct) = 5e920c85dd27f1dd761fe7083074fed0eb1edeae 7SHA1 (patch-SConstruct) = 6ec188274fb25614494ec192be7809a6a01962de
8SHA1 (patch-debian_mongod.conf) = e5074b5f7ad50560b99d652feab58da764ba542c 8SHA1 (patch-debian_mongod.conf) = e5074b5f7ad50560b99d652feab58da764ba542c
9SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5 9SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5
10SHA1 (patch-src_mongo_db_dbwebserver.cpp) = 1e7bb9588930742839d2bc9e26b33751a64f98c7 10SHA1 (patch-src_mongo_db_dbwebserver.cpp) = 1e7bb9588930742839d2bc9e26b33751a64f98c7
11SHA1 (patch-src_mongo_db_fts_unicode_string.cpp) = 98c5b1b39c07190f08ec9f22ec3002b0a803f72f 11SHA1 (patch-src_mongo_db_fts_unicode_string.cpp) = 98c5b1b39c07190f08ec9f22ec3002b0a803f72f
12SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = 52064034fabb5de63eccf87ddd140303c54f0312 12SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = 52064034fabb5de63eccf87ddd140303c54f0312
13SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96 13SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
14SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726 14SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726
 15SHA1 (patch-src_mongo_installer_msi_SConscript) = 78424fa10f90470dd941b900ef8fd131d28f6e65
15SHA1 (patch-src_mongo_platform_random.cpp) = 59c31e55fc2dc5a2b82b8f16dacf8736d8354cdb 16SHA1 (patch-src_mongo_platform_random.cpp) = 59c31e55fc2dc5a2b82b8f16dacf8736d8354cdb
16SHA1 (patch-src_mongo_platform_stack__locator__dragonfly.cpp) = fb885c491e4de1cfbc2875620d854af726e5b45f 17SHA1 (patch-src_mongo_platform_stack__locator__dragonfly.cpp) = fb885c491e4de1cfbc2875620d854af726e5b45f
17SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3b09e86b2401555b6ab4c31d14c0693d766119c2 18SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3b09e86b2401555b6ab4c31d14c0693d766119c2
18SHA1 (patch-src_mongo_shell_bench.cpp) = c0fd15347d35e37daf87b642148215dee3ab7220 19SHA1 (patch-src_mongo_shell_bench.cpp) = c0fd15347d35e37daf87b642148215dee3ab7220
19SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = f975925f56125d48b5124894fa1adf1382a634d2 20SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = f975925f56125d48b5124894fa1adf1382a634d2
20SHA1 (patch-src_mongo_util_intrusive__counter.h) = 9f1af59e1bc86e33bf183a6dda1737007afc7a18 21SHA1 (patch-src_mongo_util_intrusive__counter.h) = 9f1af59e1bc86e33bf183a6dda1737007afc7a18
21SHA1 (patch-src_mongo_util_net_miniwebserver.cpp) = 3715e826b8d03793066a84b2c1680c32c6ee6368 22SHA1 (patch-src_mongo_util_net_miniwebserver.cpp) = 3715e826b8d03793066a84b2c1680c32c6ee6368
22SHA1 (patch-src_mongo_util_processinfo__dragonfly.cpp) = 62c236ce820dfe81f45625b15e022cca0f2c10ee 23SHA1 (patch-src_mongo_util_processinfo__dragonfly.cpp) = 62c236ce820dfe81f45625b15e022cca0f2c10ee
23SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 6eabe5ffec4168bb9ba8a58b7d742772d38b4714 24SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 6eabe5ffec4168bb9ba8a58b7d742772d38b4714
24SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_dpml__exception.c) = ef3b260e8a49227cbbabf427500b7c70bce15083 25SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_dpml__exception.c) = ef3b260e8a49227cbbabf427500b7c70bce15083
25SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h) = 39f6fba82e2870ee4a5d99785033621225a72a16 26SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h) = 39f6fba82e2870ee4a5d99785033621225a72a16
26SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h) = d3a85d3a3b33691466c65cdf51c56f221429aea9 27SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h) = d3a85d3a3b33691466c65cdf51c56f221429aea9
27SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_build_js-confdefs.h) = c2ad1041b5c1ff9fac9085d2a8963781f51873a8 28SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_build_js-confdefs.h) = c2ad1041b5c1ff9fac9085d2a8963781f51873a8
28SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_include_js-config.h) = 7ddbb4e3bf4126a1be2195acc82ff859e8130a01 29SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_include_js-config.h) = 7ddbb4e3bf4126a1be2195acc82ff859e8130a01
29SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94 30SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
30SHA1 (patch-src_third__party_wiredtiger_SConscript) = 9b11a7703f4db845fb38ba996238fe1ca7f24767 31SHA1 (patch-src_third__party_wiredtiger_SConscript) = 71fd2326a4e95fec674326225bce5ccf5793aa5a
31SHA1 (patch-src_third__party_wiredtiger_build__dragonfly_wiredtiger__config.h) = 0b00da401f832d985107dfa5dcc6447db4beec6d 32SHA1 (patch-src_third__party_wiredtiger_build__dragonfly_wiredtiger__config.h) = 0b00da401f832d985107dfa5dcc6447db4beec6d
32SHA1 (patch-src_third__party_wiredtiger_build__netbsd_wiredtiger__config.h) = edd3c4e5784e52ad0078bcb7ef1e0902bc354285 33SHA1 (patch-src_third__party_wiredtiger_build__netbsd_wiredtiger__config.h) = edd3c4e5784e52ad0078bcb7ef1e0902bc354285
cvs diff -r1.6 -r1.7 pkgsrc/databases/mongodb/patches/patch-SConstruct (expand / switch to unified diff)

--- pkgsrc/databases/mongodb/patches/patch-SConstruct 2017/05/29 14:44:47 1.6
+++ pkgsrc/databases/mongodb/patches/patch-SConstruct 2017/10/08 22:17:06 1.7
@@ -1,60 +1,139 @@ @@ -1,60 +1,139 @@
1$NetBSD: patch-SConstruct,v 1.6 2017/05/29 14:44:47 ryoon Exp $ 1$NetBSD: patch-SConstruct,v 1.7 2017/10/08 22:17:06 tnn Exp $
2 2
3Add support for NetBSD/Dragonfly, fix locations. 3Add support for NetBSD/Dragonfly, fix locations.
4Respect LDFLAGS and CXXFLAGS 4Respect LDFLAGS and CXXFLAGS
5 5
6--- SConstruct.orig 2017-04-20 21:43:42.000000000 +0000 6--- SConstruct.orig 2017-04-20 21:43:42.000000000 +0000
7+++ SConstruct 7+++ SConstruct
 8@@ -30,7 +30,7 @@ EnsureSConsVersion( 2, 3, 0 )
 9 def print_build_failures():
 10 from SCons.Script import GetBuildFailures
 11 for bf in GetBuildFailures():
 12- print "%s failed: %s" % (bf.node, bf.errstr)
 13+ print("%s failed: %s" % (bf.node, bf.errstr))
 14 atexit.register(print_build_failures)
 15
 16 def versiontuple(v):
8@@ -49,8 +49,12 @@ def get_running_os_name(): 17@@ -49,8 +49,12 @@ def get_running_os_name():
9 running_os = os.sys.platform 18 running_os = os.sys.platform
10 if running_os.startswith('linux'): 19 if running_os.startswith('linux'):
11 running_os = 'linux' 20 running_os = 'linux'
12+ elif running_os.startswith('dragonfly'): 21+ elif running_os.startswith('dragonfly'):
13+ running_os = 'dragonfly' 22+ running_os = 'dragonfly'
14 elif running_os.startswith('freebsd'): 23 elif running_os.startswith('freebsd'):
15 running_os = 'freebsd' 24 running_os = 'freebsd'
16+ elif running_os.startswith('netbsd'): 25+ elif running_os.startswith('netbsd'):
17+ running_os = 'netbsd' 26+ running_os = 'netbsd'
18 elif running_os.startswith('openbsd'): 27 elif running_os.startswith('openbsd'):
19 running_os = 'openbsd' 28 running_os = 'openbsd'
20 elif running_os == 'sunos5': 29 elif running_os == 'sunos5':
21@@ -68,7 +72,7 @@ def env_get_os_name_wrapper(self): 30@@ -68,7 +72,7 @@ def env_get_os_name_wrapper(self):
22  31
23 def is_os_raw(target_os, os_list_to_check): 32 def is_os_raw(target_os, os_list_to_check):
24 okay = False 33 okay = False
25- posix_os_list = [ 'linux', 'openbsd', 'freebsd', 'osx', 'solaris' ] 34- posix_os_list = [ 'linux', 'openbsd', 'freebsd', 'osx', 'solaris' ]
26+ posix_os_list = [ 'linux', 'openbsd', 'freebsd', 'osx', 'solaris', 'dragonfly', 'netbsd' ] 35+ posix_os_list = [ 'linux', 'openbsd', 'freebsd', 'osx', 'solaris', 'dragonfly', 'netbsd' ]
27  36
28 for p in os_list_to_check: 37 for p in os_list_to_check:
29 if p == 'posix' and target_os in posix_os_list: 38 if p == 'posix' and target_os in posix_os_list:
 39@@ -511,7 +515,7 @@ try:
 40 version_data = json.load(version_fp)
 41
 42 if 'version' not in version_data:
 43- print "version.json does not contain a version string"
 44+ print("version.json does not contain a version string")
 45 Exit(1)
 46 if 'githash' not in version_data:
 47 version_data['githash'] = utils.getGitVersion()
 48@@ -519,7 +523,7 @@ try:
 49 except IOError as e:
 50 # If the file error wasn't because the file is missing, error out
 51 if e.errno != errno.ENOENT:
 52- print "Error opening version.json: {0}".format(e.strerror)
 53+ print("Error opening version.json: {0}".format(e.strerror))
 54 Exit(1)
 55
 56 version_data = {
 57@@ -528,7 +532,7 @@ except IOError as e:
 58 }
 59
 60 except ValueError as e:
 61- print "Error decoding version.json: {0}".format(e)
 62+ print("Error decoding version.json: {0}".format(e))
 63 Exit(1)
 64
 65 # Setup the command-line variables
 66@@ -598,7 +602,7 @@ def variable_distsrc_converter(val):
 67
 68 variables_files = variable_shlex_converter(get_option('variables-files'))
 69 for file in variables_files:
 70- print "Using variable customization file %s" % file
 71+ print("Using variable customization file %s" % file)
 72
 73 env_vars = Variables(
 74 files=variables_files,
30@@ -892,6 +896,7 @@ envDict = dict(BUILD_ROOT=buildDir, 75@@ -892,6 +896,7 @@ envDict = dict(BUILD_ROOT=buildDir,
31 INSTALL_DIR=installDir, 76 INSTALL_DIR=installDir,
32 CONFIG_HEADER_DEFINES={}, 77 CONFIG_HEADER_DEFINES={},
33 LIBDEPS_TAG_EXPANSIONS=[], 78 LIBDEPS_TAG_EXPANSIONS=[],
34+ ENV = os.environ, 79+ ENV = os.environ,
35 ) 80 )
36  81
37 env = Environment(variables=env_vars, **envDict) 82 env = Environment(variables=env_vars, **envDict)
 83@@ -901,12 +906,12 @@ env.AddMethod(env_os_is_wrapper, 'Target
 84 env.AddMethod(env_get_os_name_wrapper, 'GetTargetOSName')
 85
 86 def fatal_error(env, msg, *args):
 87- print msg.format(*args)
 88+ print(msg.format(*args))
 89 Exit(1)
 90
 91 def conf_error(env, msg, *args):
 92- print msg.format(*args)
 93- print "See {0} for details".format(env['CONFIGURELOG'].abspath)
 94+ print(msg.format(*args))
 95+ print("See {0} for details".format(env['CONFIGURELOG'].abspath))
 96
 97 Exit(1)
 98
 99@@ -926,7 +931,7 @@ else:
 100 env.AddMethod(lambda env: env['VERBOSE'], 'Verbose')
 101
 102 if has_option('variables-help'):
 103- print env_vars.GenerateHelpText(env)
 104+ print(env_vars.GenerateHelpText(env))
 105 Exit(0)
 106
 107 unknown_vars = env_vars.UnknownVariables()
38@@ -1029,7 +1034,9 @@ def CheckForProcessor(context, which_arc 108@@ -1029,7 +1034,9 @@ def CheckForProcessor(context, which_arc
39 os_macros = { 109 os_macros = {
40 "windows": "_WIN32", 110 "windows": "_WIN32",
41 "solaris": "__sun", 111 "solaris": "__sun",
42+ "dragonfly": "__DragonFly__", 112+ "dragonfly": "__DragonFly__",
43 "freebsd": "__FreeBSD__", 113 "freebsd": "__FreeBSD__",
44+ "netbsd": "__NetBSD__", 114+ "netbsd": "__NetBSD__",
45 "openbsd": "__OpenBSD__", 115 "openbsd": "__OpenBSD__",
46 "osx": "__APPLE__", 116 "osx": "__APPLE__",
47 "linux": "__linux__", 117 "linux": "__linux__",
 118@@ -1124,7 +1131,7 @@ else:
 119 env['TARGET_ARCH'] = detected_processor
 120
 121 if env['TARGET_OS'] not in os_macros:
 122- print "No special config for [{0}] which probably means it won't work".format(env['TARGET_OS'])
 123+ print("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS']))
 124 elif not detectConf.CheckForOS(env['TARGET_OS']):
 125 env.ConfError("TARGET_OS ({0}) is not supported by compiler", env['TARGET_OS'])
 126
48@@ -1360,7 +1367,7 @@ elif env['_LIBDEPS'] == '$_LIBDEPS_LIBS' 127@@ -1360,7 +1367,7 @@ elif env['_LIBDEPS'] == '$_LIBDEPS_LIBS'
49  128
50 libdeps.setup_environment(env, emitting_shared=(link_model.startswith("dynamic"))) 129 libdeps.setup_environment(env, emitting_shared=(link_model.startswith("dynamic")))
51  130
52-if env.TargetOSIs('linux', 'freebsd', 'openbsd'): 131-if env.TargetOSIs('linux', 'freebsd', 'openbsd'):
53+if env.TargetOSIs('linux', 'dragonfly', 'freebsd', 'netbsd', 'openbsd'): 132+if env.TargetOSIs('linux', 'dragonfly', 'freebsd', 'netbsd', 'openbsd'):
54 env['LINK_LIBGROUP_START'] = '-Wl,--start-group' 133 env['LINK_LIBGROUP_START'] = '-Wl,--start-group'
55 env['LINK_LIBGROUP_END'] = '-Wl,--end-group' 134 env['LINK_LIBGROUP_END'] = '-Wl,--end-group'
56 env['LINK_WHOLE_ARCHIVE_START'] = '-Wl,--whole-archive' 135 env['LINK_WHOLE_ARCHIVE_START'] = '-Wl,--whole-archive'
57@@ -1388,10 +1395,24 @@ if env.TargetOSIs('linux'): 136@@ -1388,10 +1395,24 @@ if env.TargetOSIs('linux'):
58 elif env.TargetOSIs('solaris'): 137 elif env.TargetOSIs('solaris'):
59 env.Append( LIBS=["socket","resolv","lgrp"] ) 138 env.Append( LIBS=["socket","resolv","lgrp"] )
60  139
File Added: pkgsrc/databases/mongodb/patches/Attic/patch-src_mongo_installer_msi_SConscript
$NetBSD: patch-src_mongo_installer_msi_SConscript,v 1.1 2017/10/08 22:17:06 tnn Exp $

--- src/mongo/installer/msi/SConscript.orig	2017-04-20 21:43:42.000000000 +0000
+++ src/mongo/installer/msi/SConscript
@@ -69,8 +69,8 @@ else:
       upgrade_code = '9295A251-1B1F-45FB-96FF-35B57E490613'
 
 if 'msi' in BUILD_TARGETS and msi_edition == 'SSL' and msi_flavor != '2008R2Plus':
-  print "Building the MongoDB SSL MSI is only supported on Windows 2008 R2+ or Windows 7+ platforms."
-  print "You must add --win-version-min=ws08r2 to your scons flags"
+  print("Building the MongoDB SSL MSI is only supported on Windows 2008 R2+ or Windows 7+ platforms.")
+  print("You must add --win-version-min=ws08r2 to your scons flags")
   exit(1)
 
 if msi_platform == 'x64':
cvs diff -r1.4 -r1.5 pkgsrc/databases/mongodb/patches/patch-src_third__party_wiredtiger_SConscript (expand / switch to unified diff)

--- pkgsrc/databases/mongodb/patches/patch-src_third__party_wiredtiger_SConscript 2016/06/17 11:51:08 1.4
+++ pkgsrc/databases/mongodb/patches/patch-src_third__party_wiredtiger_SConscript 2017/10/08 22:17:06 1.5
@@ -1,19 +1,28 @@ @@ -1,19 +1,28 @@
1$NetBSD: patch-src_third__party_wiredtiger_SConscript,v 1.4 2016/06/17 11:51:08 fhajny Exp $ 1$NetBSD: patch-src_third__party_wiredtiger_SConscript,v 1.5 2017/10/08 22:17:06 tnn Exp $
2 2
3* Add NetBSD case. 3* Add NetBSD case.
4 4
5--- src/third_party/wiredtiger/SConscript.orig 2016-06-02 14:46:27.000000000 +0000 5--- src/third_party/wiredtiger/SConscript.orig 2017-04-20 21:43:42.000000000 +0000
6+++ src/third_party/wiredtiger/SConscript 6+++ src/third_party/wiredtiger/SConscript
7@@ -51,8 +51,12 @@ elif env.TargetOSIs('solaris'): 7@@ -62,8 +62,12 @@ elif env.TargetOSIs('solaris'):
8 # For an explanation of __EXTENSIONS__, 8 # For an explanation of __EXTENSIONS__,
9 # see http://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html 9 # see http://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html
10 env.Append(CPPDEFINES=["__EXTENSIONS__"]) 10 env.Append(CPPDEFINES=["__EXTENSIONS__"])
11+elif env.TargetOSIs('dragonfly'): 11+elif env.TargetOSIs('dragonfly'):
12+ env.Append(CPPPATH=["build_dragonfly"]) 12+ env.Append(CPPPATH=["build_dragonfly"])
13 elif env.TargetOSIs('freebsd'): 13 elif env.TargetOSIs('freebsd'):
14 env.Append(CPPPATH=["build_freebsd"]) 14 env.Append(CPPPATH=["build_freebsd"])
15+elif env.TargetOSIs('netbsd'): 15+elif env.TargetOSIs('netbsd'):
16+ env.Append(CPPPATH=["build_netbsd"]) 16+ env.Append(CPPPATH=["build_netbsd"])
17 elif env.TargetOSIs('openbsd'): 17 elif env.TargetOSIs('openbsd'):
18 env.Append(CPPPATH=["build_openbsd"]) 18 env.Append(CPPPATH=["build_openbsd"])
19 elif env.TargetOSIs('linux'): 19 elif env.TargetOSIs('linux'):
 20@@ -93,7 +97,7 @@ if (VERSION_MAJOR == None or
 21 VERSION_MINOR == None or
 22 VERSION_PATCH == None or
 23 VERSION_STRING == None):
 24- print "Failed to find version variables in " + version_file
 25+ print("Failed to find version variables in " + version_file)
 26 Exit(1)
 27
 28 wiredtiger_includes = """