[98087] trunk/dports/databases/mongodb

[ryandesign at macports.org]

Revision: 98087
          http://trac.macports.org//changeset/98087
Author:   ryandesign at macports.org
Date:     2012-09-24 10:37:09 -0700 (Mon, 24 Sep 2012)
Log Message:
-----------
mongodb: change how flags are supplied to scons (specifically -arch flags, but also CPPFLAGS and LDFLAGS), resulting in scons no longer putting quotation marks around the -arch flags in the CXXFLAGS, resulting in the build now succeeding with gcc

Modified Paths:
--------------
    trunk/dports/databases/mongodb/Portfile
    trunk/dports/databases/mongodb/files/patch-SConstruct.diff

Modified: trunk/dports/databases/mongodb/Portfile
===================================================================
--- trunk/dports/databases/mongodb/Portfile	2012-09-24 16:06:18 UTC (rev 98086)
+++ trunk/dports/databases/mongodb/Portfile	2012-09-24 17:37:09 UTC (rev 98087)
@@ -42,7 +42,6 @@
 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" \
-        ${worksrcpath}/SConstruct \
         ${worksrcpath}/distsrc/client/SConstruct
 }
 
@@ -55,10 +54,9 @@
 }
 
 build.env           TERM=xterm \
-                    CFLAGS="[get_canonical_archflags cc]" \
-                    CPPFLAGS="-I${prefix}/include/js" \
-                    CXXFLAGS="[get_canonical_archflags cxx]" \
-                    LINKFLAGS="[get_canonical_archflags ld]"
+                    ARCHFLAGS="[get_canonical_archflags]" \
+                    CPPFLAGS="${configure.cppflags} -I${prefix}/include/js" \
+                    LDFLAGS="${configure.ldflags}"
 
 build.cmd           ${prefix}/bin/scons
 build.target        all mongobridge mongosniff

Modified: trunk/dports/databases/mongodb/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-SConstruct.diff	2012-09-24 16:06:18 UTC (rev 98086)
+++ trunk/dports/databases/mongodb/files/patch-SConstruct.diff	2012-09-24 17:37:09 UTC (rev 98087)
@@ -1,6 +1,6 @@
 --- SConstruct.orig	2012-08-28 00:28:11.000000000 -0500
-+++ SConstruct	2012-08-30 04:19:10.000000000 -0500
-@@ -486,21 +486,14 @@
++++ SConstruct	2012-09-24 11:16:43.000000000 -0500
+@@ -486,21 +486,9 @@
      darwin = True
      platform = "osx" # prettier than darwin
  
@@ -19,12 +19,7 @@
 -    else:
 -       env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
 -       env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
-+    env.Append( EXTRACPPPATH=["@@PREFIX@@/include"] )
-+    env.Append( EXTRALIBPATH=["@@PREFIX@@/lib"] )
-+    env["CFLAGS"] = os.getenv("CFLAGS")
-+    env["CPPFLAGS"] = os.getenv("CPPFLAGS")
-+    env["CXXFLAGS"] = os.getenv("CXXFLAGS")
-+    env["LINKFLAGS"] = os.getenv("LINKFLAGS")
++    env.MergeFlags( [ os.getenv("CPPFLAGS"), os.getenv("LDFLAGS"), os.getenv("ARCHFLAGS") ] )
  
  elif os.sys.platform.startswith("linux"):
      linux = True
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120924/25ac78b0/attachment.html>