Changeset 98087

Timestamp:

Sep 24, 2012, 5:37:09 PM (12 years ago)

Author:

ryandesign@…

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

Location:

trunk/dports/databases/mongodb

Files:

• Portfile (modified) (2 diffs)
• files/patch-SConstruct.diff (modified) (2 diffs)

trunk/dports/databases/mongodb/Portfile

@@ -43 +43 @@
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" \
-        ${worksrcpath}/SConstruct \
         ${worksrcpath}/distsrc/client/SConstruct
 }
@@ -56 +55 @@
 
 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

trunk/dports/databases/mongodb/files/patch-SConstruct.diff

@@ -1 +1 @@
 --- 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
@@ -20 +20 @@
 -       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"):