Wed Jul 10 17:45:58 2019 UTC ()
Remove CXXFLAGS/LINKFLAGS hack


(adam)
diff -r1.2 -r1.3 pkgsrc/databases/mongodb3/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/mongodb3/patches/patch-SConstruct
cvs diff -r1.2 -r1.3 pkgsrc/databases/mongodb3/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mongodb3/distinfo 2019/07/09 07:28:30 1.2
+++ pkgsrc/databases/mongodb3/distinfo 2019/07/10 17:45:58 1.3
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.2 2019/07/09 07:28:30 adam Exp $ 1$NetBSD: distinfo,v 1.3 2019/07/10 17:45:58 adam Exp $
2 2
3SHA1 (mongodb-src-r3.4.21.tar.gz) = af4e39c4d91332e9216e924c27f9e7230fb0fe88 3SHA1 (mongodb-src-r3.4.21.tar.gz) = af4e39c4d91332e9216e924c27f9e7230fb0fe88
4RMD160 (mongodb-src-r3.4.21.tar.gz) = d276839102a6dbef7f069154172025f8990b5d59 4RMD160 (mongodb-src-r3.4.21.tar.gz) = d276839102a6dbef7f069154172025f8990b5d59
5SHA512 (mongodb-src-r3.4.21.tar.gz) = 8f4f091ab0a018e6476b860392c26bd379d34b62d5f6a510ae515c992b177407ee370c213579f70d5595d98a8dc0c2fd6b97ccf77683f7995d5d4e1bf5ca367b 5SHA512 (mongodb-src-r3.4.21.tar.gz) = 8f4f091ab0a018e6476b860392c26bd379d34b62d5f6a510ae515c992b177407ee370c213579f70d5595d98a8dc0c2fd6b97ccf77683f7995d5d4e1bf5ca367b
6Size (mongodb-src-r3.4.21.tar.gz) = 40151763 bytes 6Size (mongodb-src-r3.4.21.tar.gz) = 40151763 bytes
7SHA1 (patch-SConstruct) = da410da1bd59c5a7b6ac5e3ba00144bf569efd77 7SHA1 (patch-SConstruct) = b6c2893d82d9b954c889d867ec909a05728af83d
8SHA1 (patch-src_mongo_base_initializer.h) = f82d58895251f7be08a09012ed7db64e3863a1fe 8SHA1 (patch-src_mongo_base_initializer.h) = f82d58895251f7be08a09012ed7db64e3863a1fe
9SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = 52064034fabb5de63eccf87ddd140303c54f0312 9SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = 52064034fabb5de63eccf87ddd140303c54f0312
10SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96 10SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
11SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726 11SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726
12SHA1 (patch-src_mongo_db_repl_oplog__fetcher.cpp) = e12dbfbd4e70ee210cdd4eb0582661666e8eb06a 12SHA1 (patch-src_mongo_db_repl_oplog__fetcher.cpp) = e12dbfbd4e70ee210cdd4eb0582661666e8eb06a
13SHA1 (patch-src_mongo_installer_msi_SConscript) = 78424fa10f90470dd941b900ef8fd131d28f6e65 13SHA1 (patch-src_mongo_installer_msi_SConscript) = 78424fa10f90470dd941b900ef8fd131d28f6e65
14SHA1 (patch-src_mongo_platform_random.cpp) = 9af0fd82a653bf4f273ce107e54c5e63eaeb3b85 14SHA1 (patch-src_mongo_platform_random.cpp) = 9af0fd82a653bf4f273ce107e54c5e63eaeb3b85
15SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3f67bbae82c0f3cae410a21219589bc082e7b9b1 15SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3f67bbae82c0f3cae410a21219589bc082e7b9b1
16SHA1 (patch-src_mongo_shell_bench.cpp) = c0fd15347d35e37daf87b642148215dee3ab7220 16SHA1 (patch-src_mongo_shell_bench.cpp) = c0fd15347d35e37daf87b642148215dee3ab7220
17SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = 952b1599364893d9fd0be915e3d0c2faabb9153f 17SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = 952b1599364893d9fd0be915e3d0c2faabb9153f
18SHA1 (patch-src_mongo_util_intrusive__counter.h) = 9f1af59e1bc86e33bf183a6dda1737007afc7a18 18SHA1 (patch-src_mongo_util_intrusive__counter.h) = 9f1af59e1bc86e33bf183a6dda1737007afc7a18
19SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 6c01ad839ff31e7500d76af6622dfa726fcc8264 19SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 6c01ad839ff31e7500d76af6622dfa726fcc8264
20SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_dpml__exception.c) = ef3b260e8a49227cbbabf427500b7c70bce15083 20SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_dpml__exception.c) = ef3b260e8a49227cbbabf427500b7c70bce15083
cvs diff -r1.2 -r1.3 pkgsrc/databases/mongodb3/patches/patch-SConstruct (expand / switch to unified diff)

--- pkgsrc/databases/mongodb3/patches/patch-SConstruct 2019/07/09 07:28:30 1.2
+++ pkgsrc/databases/mongodb3/patches/patch-SConstruct 2019/07/10 17:45:58 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-SConstruct,v 1.2 2019/07/09 07:28:30 adam Exp $ 1$NetBSD: patch-SConstruct,v 1.3 2019/07/10 17:45:58 adam Exp $
2 2
3Add support for NetBSD/Dragonfly. 3Add support for NetBSD/Dragonfly.
4Fix locations. 4Fix locations.
5Don't compile with debug info. 5Don't compile with debug info.
6Don't mess with the linker. 6Don't mess with the linker.
7Respect LDFLAGS and CXXFLAGS 7Respect LDFLAGS and CXXFLAGS
8 8
9--- SConstruct.orig 2019-05-21 17:07:37.000000000 +0000 9--- SConstruct.orig 2019-05-21 17:07:37.000000000 +0000
10+++ SConstruct 10+++ SConstruct
11@@ -30,7 +30,7 @@ EnsureSConsVersion( 2, 3, 0 ) 11@@ -30,7 +30,7 @@ EnsureSConsVersion( 2, 3, 0 )
12 def print_build_failures(): 12 def print_build_failures():
13 from SCons.Script import GetBuildFailures 13 from SCons.Script import GetBuildFailures
14 for bf in GetBuildFailures(): 14 for bf in GetBuildFailures():
@@ -159,36 +159,26 @@ Respect LDFLAGS and CXXFLAGS @@ -159,36 +159,26 @@ Respect LDFLAGS and CXXFLAGS
159+ env.Append( CPPDEFINES=[ "__netbsd__" ] ) 159+ env.Append( CPPDEFINES=[ "__netbsd__" ] )
160+ 160+
161 elif env.TargetOSIs('openbsd'): 161 elif env.TargetOSIs('openbsd'):
162 env.Append( LIBS=[ "kvm" ] ) 162 env.Append( LIBS=[ "kvm" ] )
163  163
164@@ -1564,7 +1585,6 @@ if env.TargetOSIs('posix'): 164@@ -1564,7 +1585,6 @@ if env.TargetOSIs('posix'):
165 # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. 165 # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
166 env.Append( CCFLAGS=["-fno-omit-frame-pointer", 166 env.Append( CCFLAGS=["-fno-omit-frame-pointer",
167 "-fno-strict-aliasing", 167 "-fno-strict-aliasing",
168- "-ggdb", 168- "-ggdb",
169 "-pthread", 169 "-pthread",
170 "-Wall", 170 "-Wall",
171 "-Wsign-compare", 171 "-Wsign-compare",
172@@ -1577,6 +1597,9 @@ if env.TargetOSIs('posix'): 
173  
174 env.Append( CXXFLAGS=["-Woverloaded-virtual"] ) 
175 env.Append( LINKFLAGS=["-pthread"] ) 
176+ env.Append( CPPDEFINES=["XP_UNIX=1"] ) 
177+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) 
178+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) 
179  
180 # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program 
181 # startup. 
182@@ -2165,9 +2188,9 @@ def doConfigure(myenv): 172@@ -2165,9 +2188,9 @@ def doConfigure(myenv):
183 if usingLibStdCxx: 173 if usingLibStdCxx:
184 def CheckModernLibStdCxx(context): 174 def CheckModernLibStdCxx(context):
185 test_body = """ 175 test_body = """
186- #if !__has_include(<experimental/filesystem>) 176- #if !__has_include(<experimental/filesystem>)
187- #error "libstdc++ from GCC 5.3.0 or newer is required" 177- #error "libstdc++ from GCC 5.3.0 or newer is required"
188- #endif 178- #endif
189+ //#if !__has_include(<experimental/filesystem>) 179+ //#if !__has_include(<experimental/filesystem>)
190+ //#error "libstdc++ from GCC 5.3.0 or newer is required" 180+ //#error "libstdc++ from GCC 5.3.0 or newer is required"
191+ //#endif 181+ //#endif
192 """ 182 """
193  183
194 context.Message('Checking for libstdc++ 5.3.0 or better... ') 184 context.Message('Checking for libstdc++ 5.3.0 or better... ')