diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2011-12-20 12:31:34 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2011-12-20 12:31:34 +0000 |
| commit | a0eee5ec4e92327a543b34267df670ce0879ea5b (patch) | |
| tree | b4e80534604d2b71a3231d6bcce525d2cff16379 /databases/mongodb/files/patch-SConstruct | |
| parent | 7d9ca670c091e831da71117228e083e10b70bb24 (diff) | |
| download | ports-a0eee5ec4e92327a543b34267df670ce0879ea5b.tar.gz ports-a0eee5ec4e92327a543b34267df670ce0879ea5b.zip | |
Upgrade to 2.0.2
PR: ports/163399
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=287730
Diffstat (limited to 'databases/mongodb/files/patch-SConstruct')
| -rw-r--r-- | databases/mongodb/files/patch-SConstruct | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/databases/mongodb/files/patch-SConstruct b/databases/mongodb/files/patch-SConstruct index 4c2bea1cf11e..467418ea8637 100644 --- a/databases/mongodb/files/patch-SConstruct +++ b/databases/mongodb/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct.orig 2011-04-06 04:40:13.000000000 +0000 -+++ SConstruct 2011-10-04 19:16:33.000000000 +0000 -@@ -679,7 +679,10 @@ +--- SConstruct.orig 2011-12-16 18:02:27.000000000 +0100 ++++ SConstruct 2011-12-17 04:39:19.000000000 +0100 +@@ -702,7 +702,10 @@ #make scons colorgcc friendly env['ENV']['HOME'] = os.environ['HOME'] @@ -12,7 +12,19 @@ if linux and has_option( "sharedclient" ): env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " ) -@@ -1473,7 +1476,7 @@ +@@ -785,8 +788,9 @@ + options_topass["nix"] = nix + + if has_option( "use-system-" + shortName ) or has_option( "use-system-all" ): +- print( "using system version of: " + shortName ) +- myModule.configureSystem( env , fileLists , options_topass ) ++ if not (shortName == 'sm' and usev8): ++ print( "using system version of: " + shortName ) ++ myModule.configureSystem( env , fileLists , options_topass ) + else: + myModule.configure( env , fileLists , options_topass ) + +@@ -1446,7 +1450,7 @@ fullInstallName = installDir + "/bin/" + name allBinaries += [ name ] @@ -20,4 +32,4 @@ + if (solaris or linux or freebsd) and (not has_option("nostrip")): e.AddPostAction( inst, e.Action( 'strip ' + fullInstallName ) ) - if linux and len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) == "s3dist": + if not has_option( "no-glibc-check" ) and linux and len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) == "s3dist": |