[110522] trunk/dports

[larryv at macports.org]

Revision: 110522
          https://trac.macports.org/changeset/110522
Author:   larryv at macports.org
Date:     2013-08-31 23:31:43 -0700 (Sat, 31 Aug 2013)
Log Message:
-----------
Use configure.cxx_stdlib when -stdlib is involved.

Modified Paths:
--------------
    trunk/dports/devel/boost/Portfile
    trunk/dports/devel/cctools/Portfile
    trunk/dports/devel/cmake/Portfile
    trunk/dports/devel/gmp/Portfile
    trunk/dports/devel/ld64/Portfile
    trunk/dports/graphics/exiv2/Portfile

Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile	2013-09-01 05:24:17 UTC (rev 110521)
+++ trunk/dports/devel/boost/Portfile	2013-09-01 06:31:43 UTC (rev 110522)
@@ -94,8 +94,13 @@
     set compileflags ""
     if {[string length ${configure.sdkroot}] != 0} { set compileflags "<compileflags>\"-isysroot ${configure.sdkroot}\"" }
 
-    write_jam "using darwin : : ${configure.cxx} : <cxxflags>\"${configure.cxxflags}\" ${compileflags} <linkflags>\"${configure.ldflags} ${configure.cxxflags}\" : ;"
+    set linkflags ${configure.ldflags}
+    if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {}} {
+        lappend linkflags -stdlib=${configure.cxx_stdlib}
+    }
 
+    write_jam "using darwin : : ${configure.cxx} : <cxxflags>\"${configure.cxxflags}\" ${compileflags} <linkflags>\"${linkflags}\" : ;"
+
 }
 
 # Although bjam can supposedly use parallel builds, it has random failures. See #28878 and #23531.

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2013-09-01 05:24:17 UTC (rev 110521)
+++ trunk/dports/devel/cctools/Portfile	2013-09-01 06:31:43 UTC (rev 110522)
@@ -117,13 +117,19 @@
 
 build.target    all
 
+if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {}} {
+    set stdlib_flag " -stdlib=${configure.cxx_stdlib}"
+} else {
+    set stdlib_flag {}
+}
+
 pre-build {
     build.args-append \
         RC_ProjectSourceVersion=${version} \
         USE_DEPENDENCY_FILE=NO \
         BUILD_DYLIBS=NO \
         CC="${configure.cc} ${configure.cflags}" \
-        CXX="${configure.cxx} ${configure.cxxflags}" \
+        CXX="${configure.cxx} ${configure.cxxflags}${stdlib_flag}" \
         RC_ARCHS="[get_canonical_archs]" \
         SDK="-I${prefix}/include"
 
@@ -153,7 +159,7 @@
         USE_DEPENDENCY_FILE=NO \
         BUILD_DYLIBS=NO \
         CC="${configure.cc} ${configure.cflags}" \
-        CXX="${configure.cxx} ${configure.cxxflags}" \
+        CXX="${configure.cxx} ${configure.cxxflags}${stdlib_flag}" \
         RC_ARCHS="[get_canonical_archs]" \
         SDK="-I${prefix}/include"
 

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2013-09-01 05:24:17 UTC (rev 110521)
+++ trunk/dports/devel/cmake/Portfile	2013-09-01 06:31:43 UTC (rev 110522)
@@ -49,12 +49,11 @@
 }
 
 platform darwin 11 {
-    if {[string match *-stdlib=libc++* ${configure.cxxflags}]} {
-        # TODO: Figure out why this is failing.
-        #       Since nothing links against cmake and cmake is just using the
-        #       STL, we're safe to use libstdc++ even if the user requested libc++
-        configure.cxxflags-delete "-stdlib=libc++"
-        configure.cxxflags-append "-stdlib=libstdc++"
+    # TODO: Figure out why using libc++ fails.
+    #       Since nothing links against cmake and cmake is just using
+    #       the STL, we're safe to force libstdc++
+    if {[info exists configure.cxx_stdlib]} {
+        configure.cxx_stdlib libstdc++
     }
 }
 

Modified: trunk/dports/devel/gmp/Portfile
===================================================================
--- trunk/dports/devel/gmp/Portfile	2013-09-01 05:24:17 UTC (rev 110521)
+++ trunk/dports/devel/gmp/Portfile	2013-09-01 06:31:43 UTC (rev 110522)
@@ -36,8 +36,8 @@
 configure.universal_args-delete --disable-dependency-tracking
 
 # Since we need to clear CXXFLAGS, add -stdlib=... to CXX
-if {[string match *-stdlib* ${configure.cxxflags}]} {
-    configure.cxx-append ${configure.cxxflags}
+if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {}} {
+    configure.cxx-append -stdlib=${configure.cxx_stdlib}
 }
 
 # if CFLAGS and CXXFLAGS are undefined, configure script tries to build fastest library for build machine.

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2013-09-01 05:24:17 UTC (rev 110521)
+++ trunk/dports/devel/ld64/Portfile	2013-09-01 06:31:43 UTC (rev 110522)
@@ -150,8 +150,14 @@
     CXX="${configure.cxx}" \
     OTHER_CPPFLAGS="${configure.cppflags}" \
     OTHER_CFLAGS="${configure.cflags} [get_canonical_archflags]" \
-    OTHER_CXXFLAGS="${configure.cxxflags} [get_canonical_archflags]" \
-    OTHER_LDFLAGS="${configure.ldflags} ${configure.cxxflags} [get_canonical_archflags]"
+    OTHER_CXXFLAGS="${configure.cxxflags} [get_canonical_archflags]"
+if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {}} {
+    build.args-append \
+        OTHER_LDFLAGS="${configure.ldflags} [get_canonical_archflags] -stdlib=${configure.cxx_stdlib}"
+} else {
+    build.args-append \
+        OTHER_LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
+}
 
 if {${os.major} >= 11} {
     build.args-append \

Modified: trunk/dports/graphics/exiv2/Portfile
===================================================================
--- trunk/dports/graphics/exiv2/Portfile	2013-09-01 05:24:17 UTC (rev 110521)
+++ trunk/dports/graphics/exiv2/Portfile	2013-09-01 06:31:43 UTC (rev 110522)
@@ -32,7 +32,9 @@
 destroot.destdir prefix=${destroot}${prefix}
 
 # Custom Makefiles, yich...
-configure.ldflags-append ${configure.cxxflags}
+if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {}} {
+    configure.ldflags-append -stdlib=${configure.cxx_stdlib}
+}
 
 post-configure {
 	reinplace -E {s|-arch [a-z0-9_]+||g} ${worksrcpath}/config/exiv2.pc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130831/b28e1e74/attachment.html>