On Jul 10, 2009, at 02:25, [email protected] wrote:
Revision: 53622
http://trac.macports.org/changeset/53622
Author: [email protected]
Date: 2009-07-10 00:25:19 -0700 (Fri, 10 Jul 2009)
Log Message:
-----------
databases/mongodb - update to 0.9.6 (ticket #20252); prepend
instead of append for LIBPATH so self-built libs are seen over
already-installed during upgrades
[snip]
Modified: trunk/dports/databases/mongodb/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-SConstruct.diff
2009-07-10 05:53:05 UTC (rev 53621)
+++ trunk/dports/databases/mongodb/files/patch-SConstruct.diff
2009-07-10 07:25:19 UTC (rev 53622)
@@ -1,6 +1,6 @@
---- SConstruct.orig 2009-06-23 11:41:23.000000000 -0600
-+++ SConstruct 2009-07-02 19:55:42.000000000 -0600
-@@ -273,23 +273,16 @@
+--- SConstruct.orig 2009-07-08 11:25:25.000000000 -0600
++++ SConstruct 2009-07-09 23:47:17.000000000 -0600
+@@ -304,23 +304,16 @@
env.Append( CPPPATH=[ "-I/System/Library/Frameworks/
JavaVM.framework/Versions/CurrentJDK/Headers/" ] )
@@ -21,15 +21,15 @@
- else:
- env.Append( CPPPATH=[ "/sw/include" , "/opt/local/
include"] )
- env.Append( LIBPATH=["/sw/lib/", "/opt/local/lib"] )
-+ env.Append( CPPPATH=["@@PREFIX@@/include"] )
-+ env.Append( LIBPATH=["@@PREFIX@@/lib/"] )
++ env.Append( CPPPATH=["/mp/include"] )
++ env.Append( LIBPATH=["/mp/lib/"] )
Your MacPorts prefix /mp got inserted into this patch in several places.
+ env["CC"] = os.environ["CC"]
+ env["CPP"] = os.environ["CPP"]
+ env["CXX"] = os.environ["CXX"]
elif "linux2" == os.sys.platform:
linux = True
-@@ -586,11 +579,7 @@
+@@ -624,11 +617,7 @@
haveReadLine = False
if darwin:
myenv.Append( CPPDEFINES=[ "USE_READLINE" ] )
@@ -38,11 +38,29 @@
- myCheckLib( "ncurses" , True )
- else:
- myenv.Append( LINKFLAGS=" /usr/lib/
libreadline.dylib " )
-+ myenv.Append( LINKFLAGS=" @@PREFIX@@/lib/
libreadline.dylib " )
++ myenv.Append( LINKFLAGS=" /mp/lib/libreadline.dylib " )
elif myCheckLib( "readline" , release and nix ,
staticOnly=release ):
myenv.Append( CPPDEFINES=[ "USE_READLINE" ] )
- myCheckLib( "tinfo" , staticOnly=release )
-@@ -757,8 +746,6 @@
+ myCheckLib( "ncurses" , staticOnly=release )
+@@ -714,7 +703,7 @@
+ clientEnv = env.Clone();
+ clientEnv.Append( CPPPATH=["../"] )
+ clientEnv.Prepend( LIBS=[ "mongoclient"] )
+-clientEnv.Append( LIBPATH=["."] )
++clientEnv.Prepend( LIBPATH=["."] )
+ l = clientEnv[ "LIBS" ]
+ removeIfInList( l , "pcre" )
+ removeIfInList( l , "pcrecpp" )
+@@ -722,7 +711,7 @@
+ testEnv = env.Clone()
+ testEnv.Append( CPPPATH=["../"] )
+ testEnv.Prepend( LIBS=[ "mongotestfiles" , "unittest" ] )
+-testEnv.Append( LIBPATH=["."] )
++testEnv.Prepend( LIBPATH=["."] )
+
+
+ # ----- TARGETS ------
+@@ -793,8 +782,6 @@
shellEnv["LINKFLAGS"].remove("-m64")
shellEnv["CPPPATH"].remove( "/usr/64/include" )
shellEnv["LIBPATH"].remove( "/usr/64/lib" )
@@ -51,3 +69,12 @@
l = shellEnv["LIBS"]
if linux64:
+@@ -816,7 +803,7 @@
+
+ shellEnv.VariantDir( "32bit" , "." )
+ else:
+- shellEnv.Append( LIBPATH=[ "." ] )
++ shellEnv.Prepend( LIBPATH=[ "." ] )
+
+ shellEnv = doConfigure( shellEnv , needPcre=False ,
needJava=False , shell=True )
_______________________________________________
macports-dev mailing list
[email protected]
http://lists.macosforge.org/mailman/listinfo.cgi/macports-dev
