[121269] trunk/dports
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jun 21 13:18:43 PDT 2014
Revision: 121269
https://trac.macports.org/changeset/121269
Author: jeremyhu at macports.org
Date: 2014-06-21 13:18:42 -0700 (Sat, 21 Jun 2014)
Log Message:
-----------
misc: Cleanup configure.cxx_stdlib related logic now that we can assume base 2.3 or newer
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
trunk/dports/archivers/unrar/Portfile
trunk/dports/audio/faac/Portfile
trunk/dports/audio/id3v2/Portfile
trunk/dports/cross/arm-elf-gcc/Portfile
trunk/dports/databases/db44/Portfile
trunk/dports/databases/db46/Portfile
trunk/dports/databases/db47/Portfile
trunk/dports/databases/db48/Portfile
trunk/dports/databases/db51/Portfile
trunk/dports/databases/db52/Portfile
trunk/dports/databases/db53/Portfile
trunk/dports/devel/boost/Portfile
trunk/dports/devel/cctools/Portfile
trunk/dports/devel/gmp/Portfile
trunk/dports/devel/ld64/Portfile
trunk/dports/devel/webkit-sharp/Portfile
trunk/dports/gnome/balsa/Portfile
trunk/dports/gnome/devhelp/Portfile
trunk/dports/gnome/empathy/Portfile
trunk/dports/gnome/gnome-online-accounts/Portfile
trunk/dports/gnome/gnucash/Portfile
trunk/dports/gnome/gnucash-devel/Portfile
trunk/dports/gnome/liferea/Portfile
trunk/dports/gnome/seed/Portfile
trunk/dports/gnome/yelp/Portfile
trunk/dports/gnome/zenity/Portfile
trunk/dports/graphics/birdfont/Portfile
trunk/dports/graphics/freeimage/Portfile
trunk/dports/graphics/gimp2/Portfile
trunk/dports/graphics/gimp2-devel/Portfile
trunk/dports/graphics/gimp3-devel/Portfile
trunk/dports/graphics/graphviz/Portfile
trunk/dports/graphics/graphviz-devel/Portfile
trunk/dports/graphics/lensfun/Portfile
trunk/dports/graphics/makeicns/Portfile
trunk/dports/lang/dragonegg-3.0/Portfile
trunk/dports/lang/dragonegg-3.1/Portfile
trunk/dports/lang/dragonegg-3.2/Portfile
trunk/dports/lang/dragonegg-3.3/Portfile
trunk/dports/lang/dragonegg-3.4/Portfile
trunk/dports/lang/gcc43/Portfile
trunk/dports/lang/gcc44/Portfile
trunk/dports/lang/gcc45/Portfile
trunk/dports/lang/gcc46/Portfile
trunk/dports/lang/gcc47/Portfile
trunk/dports/lang/gcc48/Portfile
trunk/dports/lang/gcc49/Portfile
trunk/dports/lang/llvm-3.5/Portfile
trunk/dports/mail/claws-mail/Portfile
trunk/dports/multimedia/VLC/Portfile
trunk/dports/multimedia/VLC-devel/Portfile
trunk/dports/multimedia/gtkpod/Portfile
trunk/dports/multimedia/libmatroska/Portfile
trunk/dports/multimedia/live555/Portfile
trunk/dports/net/dibbler/Portfile
trunk/dports/net/gpsd/Portfile
trunk/dports/print/lcdf-typetools/Portfile
trunk/dports/python/py-pysvn/Portfile
trunk/dports/python/py26-webkitgtk/Portfile
trunk/dports/python/py27-webkitgtk/Portfile
trunk/dports/science/gildas/Portfile
trunk/dports/science/gqrx/Portfile
trunk/dports/science/root5/Portfile
trunk/dports/tex/texlive-bin/Portfile
trunk/dports/textproc/bibledit/Portfile
trunk/dports/textproc/doxygen/Portfile
trunk/dports/textproc/libebml/Portfile
trunk/dports/textproc/libxl/Portfile
trunk/dports/textproc/openjade/Portfile
trunk/dports/textproc/sdcv/Portfile
trunk/dports/www/midori/Portfile
trunk/dports/www/uzbl/Portfile
trunk/dports/www/webkit-gtk/Portfile
trunk/dports/www/webkit-gtk-2.0/Portfile
trunk/dports/www/webkit-gtk-devel/Portfile
trunk/dports/x11/mesa/Portfile
trunk/dports/x11/rxvt-unicode/Portfile
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/aqua/qt4-mac/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -578,18 +578,9 @@
configure.env-append PKG_CONFIG=${prefix}/bin/pkg-config
- # set which stdlib to use; clang only; use configure.cxx_stdlib if
- # that exists, and otherwise use libc++ on 10.9 or libstdc++ on
- # 10.8 or earler.
-
+ # set which stdlib to use; clang only
if {[string match *clang* ${configure.compiler}]} {
- if {[info exists configure.cxx_stdlib]} {
- configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
- } elseif {${MINOR} == 9} {
- configure.env-append QMAKE_STDLIB="-stdlib=libc++"
- } else {
- configure.env-append QMAKE_STDLIB="-stdlib=libstdc++"
- }
+ configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
}
}
Modified: trunk/dports/archivers/unrar/Portfile
===================================================================
--- trunk/dports/archivers/unrar/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/archivers/unrar/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -38,9 +38,8 @@
configure.cxx "ccache ${configure.cxx}"
}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/audio/faac/Portfile
===================================================================
--- trunk/dports/audio/faac/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/audio/faac/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -23,28 +23,12 @@
patchfiles patch-configure.in.diff
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
+post-patch {
+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
+ reinplace "s:-lstdc\+\+:-lc++:" \
+ ${worksrcpath}/frontend/Makefile.am \
+ ${worksrcpath}/frontend/Makefile.in
}
-
- post-patch {
- if {${cxxstdlib} == "libc++"} {
- reinplace "s:-lstdc\+\+:-lc++:" \
- ${worksrcpath}/frontend/Makefile.am \
- ${worksrcpath}/frontend/Makefile.in
- }
- }
}
configure.cflags-append "-D__unix__"
Modified: trunk/dports/audio/id3v2/Portfile
===================================================================
--- trunk/dports/audio/id3v2/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/audio/id3v2/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -30,9 +30,8 @@
system "cd ${worksrcpath} && make clean"
}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/cross/arm-elf-gcc/Portfile
===================================================================
--- trunk/dports/cross/arm-elf-gcc/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/cross/arm-elf-gcc/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -182,9 +182,7 @@
}
# the bootstrap compiler doesn't accept -stdlib
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
+configure.cxx_stdlib
build.dir ${workpath}/build
Modified: trunk/dports/databases/db44/Portfile
===================================================================
--- trunk/dports/databases/db44/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db44/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -59,9 +59,8 @@
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
configure.cxx ${configure.cxx} ${cxx_stdlibflags}
Modified: trunk/dports/databases/db46/Portfile
===================================================================
--- trunk/dports/databases/db46/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db46/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -72,9 +72,8 @@
--libdir=\\\${prefix}/lib/db${branch} \
--enable-dump185
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
configure.cxx ${configure.cxx} ${cxx_stdlibflags}
Modified: trunk/dports/databases/db47/Portfile
===================================================================
--- trunk/dports/databases/db47/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db47/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -60,9 +60,8 @@
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
configure.cxx ${configure.cxx} ${cxx_stdlibflags}
Modified: trunk/dports/databases/db48/Portfile
===================================================================
--- trunk/dports/databases/db48/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db48/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -40,9 +40,8 @@
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
configure.cxx ${configure.cxx} ${cxx_stdlibflags}
Modified: trunk/dports/databases/db51/Portfile
===================================================================
--- trunk/dports/databases/db51/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db51/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -39,9 +39,8 @@
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
configure.cxx ${configure.cxx} ${cxx_stdlibflags}
Modified: trunk/dports/databases/db52/Portfile
===================================================================
--- trunk/dports/databases/db52/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db52/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -39,9 +39,8 @@
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
configure.cxx ${configure.cxx} ${cxx_stdlibflags}
Modified: trunk/dports/databases/db53/Portfile
===================================================================
--- trunk/dports/databases/db53/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db53/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -39,9 +39,8 @@
--includedir=\\\${prefix}/include/db${branch} \
--libdir=\\\${prefix}/lib/db${branch}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
configure.cxx ${configure.cxx} ${cxx_stdlibflags}
Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/boost/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -130,9 +130,7 @@
}
set cxx_stdlibflags {}
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
+ if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/cctools/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -129,9 +129,7 @@
build.target all
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/devel/gmp/Portfile
===================================================================
--- trunk/dports/devel/gmp/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/gmp/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -52,10 +52,8 @@
#
# On PowerPC machines, CFLAGS must be empty to get -force_cpusubtype_ALL.
-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]
-} then {
+set cxx_stdlibflags {}
+if {[string match *clang* ${configure.cxx}]} {
configure.cxx-append -stdlib=${configure.cxx_stdlib}
configure.cxx_stdlib
}
Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/ld64/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -82,25 +82,9 @@
set makefile "Makefile-133"
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
set cxx_stdlibflags {}
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {[string match *clang* ${configure.cxx}]} {
- set cxx_stdlibflags -stdlib=${cxxstdlib}
- }
+if {[string match *clang* ${configure.cxx}]} {
+ set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
if {${os.arch} eq "powerpc" || ${os.major} < 9} {
@@ -145,7 +129,7 @@
# http://trac.macports.org/ticket/43737
compiler.blacklist-append *gcc*
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
patchfiles-append ld64-236-hash_set.patch
}
}
Modified: trunk/dports/devel/webkit-sharp/Portfile
===================================================================
--- trunk/dports/devel/webkit-sharp/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/webkit-sharp/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -29,22 +29,8 @@
# mono is not universal
universal_variant no
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/gnome/balsa/Portfile
===================================================================
--- trunk/dports/gnome/balsa/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/balsa/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -68,22 +68,8 @@
configure.cflags-append -D_DARWIN_C_SOURCE
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
}
Modified: trunk/dports/gnome/devhelp/Portfile
===================================================================
--- trunk/dports/gnome/devhelp/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/devhelp/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -38,22 +38,8 @@
port:gtk3 \
path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
}
Modified: trunk/dports/gnome/empathy/Portfile
===================================================================
--- trunk/dports/gnome/empathy/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/empathy/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -69,22 +69,8 @@
port:gnome-settings-daemon \
port:yelp
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
}
Modified: trunk/dports/gnome/gnome-online-accounts/Portfile
===================================================================
--- trunk/dports/gnome/gnome-online-accounts/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/gnome-online-accounts/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -120,22 +120,8 @@
}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
}
Modified: trunk/dports/gnome/gnucash/Portfile
===================================================================
--- trunk/dports/gnome/gnucash/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/gnucash/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -56,22 +56,8 @@
depends_run port:yelp
}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/gnome/gnucash-devel/Portfile
===================================================================
--- trunk/dports/gnome/gnucash-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/gnucash-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -61,22 +61,8 @@
port:icu \
port:p5.12-finance-quote
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/gnome/liferea/Portfile
===================================================================
--- trunk/dports/gnome/liferea/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/liferea/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -34,22 +34,8 @@
path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
port:libglade2
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/gnome/seed/Portfile
===================================================================
--- trunk/dports/gnome/seed/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/seed/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -44,22 +44,8 @@
configure.args --disable-gettext-module
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
}
Modified: trunk/dports/gnome/yelp/Portfile
===================================================================
--- trunk/dports/gnome/yelp/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/yelp/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -67,22 +67,8 @@
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
}
Modified: trunk/dports/gnome/zenity/Portfile
===================================================================
--- trunk/dports/gnome/zenity/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/zenity/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -43,22 +43,8 @@
configure.args --disable-silent-rules
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
}
Modified: trunk/dports/graphics/birdfont/Portfile
===================================================================
--- trunk/dports/graphics/birdfont/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/birdfont/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -58,22 +58,8 @@
file copy ${worksrcpath}/build/BirdFont.app ${destroot}${applications_dir}
}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/graphics/freeimage/Portfile
===================================================================
--- trunk/dports/graphics/freeimage/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/freeimage/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -71,10 +71,7 @@
variant universal {}
# Reimplement parts of portconfigure.tcl
-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]
-} then {
+if {[string match *clang* ${configure.cxx}]} {
configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/gimp2/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -70,22 +70,6 @@
depends_run path:share/gimp/2.0/help:gimp-help-en
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-}
-
patchfiles patch-etc-gimprc.diff \
patch-freetype-includes.diff \
patch-brush-outline-not-displayed-bz719593.diff \
@@ -222,7 +206,7 @@
variant help_browser description {Enable Gimp help browser} {
configure.args-delete --without-webkit
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
} else {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
Modified: trunk/dports/graphics/gimp2-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp2-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/gimp2-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -73,22 +73,6 @@
depends_run path:share/gimp/2.0/help:gimp-help-en
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-}
-
use_parallel_build no
patchfiles patch-etc-gimprc.diff \
@@ -188,7 +172,7 @@
variant help_browser description {Enable Gimp help browser} {
configure.args-delete --without-webkit
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
} else {
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
Modified: trunk/dports/graphics/gimp3-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp3-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/gimp3-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -76,22 +76,6 @@
use_parallel_build no
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-}
-
patchfiles patch-configure.ac.diff \
patch-etc-gimprc.diff \
patch-plug-ins-twain-tw_mac.c.diff
@@ -190,7 +174,7 @@
variant help_browser description {Enable Gimp help browser} {
configure.args-delete --without-webkit
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
} else {
depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/graphviz/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -116,20 +116,7 @@
}
post-patch {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} == "libc++"} {
+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
reinplace "s:-lstdc\+\+:-lc++:" \
${worksrcpath}/configure.ac \
${worksrcpath}/cmd/dot/Makefile.am \
Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/graphviz-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -116,20 +116,7 @@
}
post-patch {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} == "libc++"} {
+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
reinplace "s:-lstdc\+\+:-lc++:" \
${worksrcpath}/configure.ac \
${worksrcpath}/cmd/dot/Makefile.am \
Modified: trunk/dports/graphics/lensfun/Portfile
===================================================================
--- trunk/dports/graphics/lensfun/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/lensfun/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -39,9 +39,8 @@
reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/build/tibs/target/mac.mak
}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/graphics/makeicns/Portfile
===================================================================
--- trunk/dports/graphics/makeicns/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/makeicns/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -34,25 +34,9 @@
patchfiles patch-IconFamily.m.diff
}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {[string match *clang* ${configure.cxx}]} {
- configure.cxxflags-append -stdlib=${cxxstdlib}
- configure.ldflags-append -stdlib=${cxxstdlib}
- }
+if {[string match *clang* ${configure.cxx}]} {
+ configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
build.env-append CC=${configure.cc} \
Modified: trunk/dports/lang/dragonegg-3.0/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.0/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.0/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -118,7 +118,7 @@
}
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
build.env-append \
Modified: trunk/dports/lang/dragonegg-3.1/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.1/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.1/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -124,7 +124,7 @@
}
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
build.env-append \
Modified: trunk/dports/lang/dragonegg-3.2/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.2/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.2/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -124,7 +124,7 @@
}
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
build.env-append \
Modified: trunk/dports/lang/dragonegg-3.3/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.3/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.3/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -118,7 +118,7 @@
}
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
build.env-append \
Modified: trunk/dports/lang/dragonegg-3.4/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.4/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.4/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -119,7 +119,7 @@
}
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
build.env-append \
Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc43/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -118,9 +118,7 @@
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
# "-stdlib" would be passed on to the bootstrap compiler if present
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
+configure.cxx_stdlib
# STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac
# BOOT_CFLAGS="-O2 -g" : from Makefile.tpl
Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc44/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -119,9 +119,7 @@
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
# "-stdlib" would be passed on to the bootstrap compiler if present
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
+configure.cxx_stdlib
# STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac
# BOOT_CFLAGS="-O2 -g" : from Makefile.tpl
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc45/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -141,9 +141,7 @@
}
# "-stdlib" would be passed on to the bootstrap compiler if present
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
+configure.cxx_stdlib
build.dir ${configure.dir}
build.target bootstrap
Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc46/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -123,9 +123,7 @@
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
# "-stdlib" would be passed on to the bootstrap compiler if present
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
+configure.cxx_stdlib
build.dir ${configure.dir}
build.target bootstrap
Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc47/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -122,9 +122,7 @@
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
# "-stdlib" would be passed on to the bootstrap compiler if present
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
+configure.cxx_stdlib
build.dir ${configure.dir}
build.target bootstrap
Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- trunk/dports/lang/gcc48/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc48/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -98,9 +98,7 @@
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
# "-stdlib" would be passed on to the bootstrap compiler if present
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
+configure.cxx_stdlib
build.dir ${configure.dir}
build.target bootstrap
Modified: trunk/dports/lang/gcc49/Portfile
===================================================================
--- trunk/dports/lang/gcc49/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc49/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -99,9 +99,7 @@
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
# "-stdlib" would be passed on to the bootstrap compiler if present
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
+configure.cxx_stdlib
build.dir ${configure.dir}
build.target bootstrap
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/llvm-3.5/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -118,24 +118,19 @@
# llvm-3.5 and later requires a C++11 runtime
compiler.blacklist *gcc* {clang < 300}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
# Note that we are forcing this choice. This means that anything linking
# against llvm-3.5 needs to also be using libc++. This is possibly
# problematic, but luckily there is just a limited set of such dependents.
- if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libc++
- }
-
+ configure.cxx_stdlib libc++
depends_lib-append port:libcxx
-}
-pre-fetch {
- if {(${os.major} < 13 && ! [info exists configure.cxx_stdlib]) ||
- (! [file exists /usr/lib/libc++.dylib])} {
- ui_error "$name requires a C++11 runtime, which your configuration does not allow"
- error "unsupported configuration"
+ pre-fetch {
+ if {![file exists /usr/lib/libc++.dylib]} {
+ ui_error "$name requires a C++11 runtime, which your configuration does not allow"
+ error "unsupported configuration"
+ }
}
}
Modified: trunk/dports/mail/claws-mail/Portfile
===================================================================
--- trunk/dports/mail/claws-mail/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/mail/claws-mail/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -47,20 +47,7 @@
# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/VLC/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -81,20 +81,7 @@
reinplace "s:librsvg-2/librsvg:librsvg:" \
${worksrcpath}/modules/text_renderer/svg.c
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} == "libc++"} {
+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
reinplace "s:-lstdc\+\+:-lc++:" \
${worksrcpath}/configure.ac \
${worksrcpath}/modules/access/Makefile.am
Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -85,20 +85,7 @@
reinplace "s:librsvg-2/librsvg:librsvg:" \
${worksrcpath}/modules/text_renderer/svg.c
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} == "libc++"} {
+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
reinplace "s:-lstdc\+\+:-lc++:" \
${worksrcpath}/configure.ac \
${worksrcpath}/modules/access/Makefile.am
Modified: trunk/dports/multimedia/gtkpod/Portfile
===================================================================
--- trunk/dports/multimedia/gtkpod/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/gtkpod/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -31,22 +31,8 @@
port:libvorbis \
path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/multimedia/libmatroska/Portfile
===================================================================
--- trunk/dports/multimedia/libmatroska/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/libmatroska/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -39,9 +39,7 @@
}
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/multimedia/live555/Portfile
===================================================================
--- trunk/dports/multimedia/live555/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/live555/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -29,10 +29,8 @@
configure.distcc no
patchfiles patch-config.macosx.diff
post-patch {
- set cxx_stdlibflags {}
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
+set cxx_stdlibflags {}
+ if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/net/dibbler/Portfile
===================================================================
--- trunk/dports/net/dibbler/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/net/dibbler/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -39,9 +39,7 @@
}
# TODO: Fix libc++ build.
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libstdc++
-}
+configure.cxx_stdlib libstdc++
post-destroot {
xinstall -d -m 0755 ${destroot}${prefix}/share/examples
Modified: trunk/dports/net/gpsd/Portfile
===================================================================
--- trunk/dports/net/gpsd/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/net/gpsd/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -36,9 +36,8 @@
variant universal {}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/print/lcdf-typetools/Portfile
===================================================================
--- trunk/dports/print/lcdf-typetools/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/print/lcdf-typetools/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -27,8 +27,7 @@
patchfiles detect-endianness-universal.patch
patchfiles-append static_assert.patch
-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} eq {libc++} &&
+if {${configure.cxx_stdlib} eq {libc++} &&
[string match *clang* ${configure.cxx}]
} then {
patchfiles-append 0001-Avoid-implicit-initializer-narrowing.patch
Modified: trunk/dports/python/py-pysvn/Portfile
===================================================================
--- trunk/dports/python/py-pysvn/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/python/py-pysvn/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -26,9 +26,8 @@
python.versions 25 26 27
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/python/py26-webkitgtk/Portfile
===================================================================
--- trunk/dports/python/py26-webkitgtk/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/python/py26-webkitgtk/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -26,22 +26,8 @@
set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/python/py27-webkitgtk/Portfile
===================================================================
--- trunk/dports/python/py27-webkitgtk/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/python/py27-webkitgtk/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -24,22 +24,8 @@
sha1 74ff2222d9aa9af6ab0aa4279b28dd2b26f5824e \
rmd160 e857939e65a9a409390f1fd256310988f592935f
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/science/gildas/Portfile
===================================================================
--- trunk/dports/science/gildas/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/science/gildas/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -59,24 +59,6 @@
default_variants-append +gcc48
}
-set cxxstdlib {}
-platform darwin {
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {[string length ${cxxstdlib}]} {
- set cxxstdlib [string map {lib -l} ${cxxstdlib}]
- }
-}
-
post-extract {
if {![gcc_variant_isset]} {
reinplace -W ${worksrcpath}/admin "s|-Wrealloc-lhs-all||" define-system.sh
@@ -84,6 +66,11 @@
}
configure {
+ set cxxstdlib {}
+ if {[string match *clang* ${configure.cxx}]} {
+ set cxxstdlib [string map {lib -l} ${configure.cxx_stdlib}]
+ }
+
reinplace -W ${worksrcpath}/admin "s|@CC@|${configure.cc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
reinplace -W ${worksrcpath}/admin "s|@CCFLAGS@|${configure.cflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
reinplace -W ${worksrcpath}/admin "s|@FC@|${configure.fc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/science/gqrx/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -23,13 +23,7 @@
# libstdc++ and libc++ runtimes; this patch is included with the
# devel from upstream.
- # configure.cxx_stdlib works with MacPorts SVN trunk, not release;
- # do something else until both work.
-
- # if {[info exists configure.cxx_stdlib] && [string match libc++ ${configure.cxx_stdlib}]}
-
patchfiles-append patch-fix-real-imag.diff
-
}
post-patch {
Modified: trunk/dports/science/root5/Portfile
===================================================================
--- trunk/dports/science/root5/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/science/root5/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -117,22 +117,8 @@
--enable-gdml \
--enable-builtin-freetype
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libc++"} {
+ if {${configure.cxx_stdlib} eq "libc++"} {
configure.args-delete --disable-c++11
configure.args-append --enable-c++11
}
Modified: trunk/dports/tex/texlive-bin/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/tex/texlive-bin/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -198,10 +198,7 @@
OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
OBJCXX=${configure.objcxx}
-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]
-} then {
+if {[string match *clang* ${configure.cxx}]} {
build.env-append OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx] -stdlib=${configure.cxx_stdlib}"
} else {
build.env-append OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx]"
Modified: trunk/dports/textproc/bibledit/Portfile
===================================================================
--- trunk/dports/textproc/bibledit/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/bibledit/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -37,22 +37,8 @@
distname ${name}-gtk-${version}
worksrcdir ${name}-gtk-${version}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/doxygen/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -73,9 +73,8 @@
delete ${worksrcpath}/src/vhdlparser.h
}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/textproc/libebml/Portfile
===================================================================
--- trunk/dports/textproc/libebml/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/libebml/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -37,9 +37,7 @@
}
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/textproc/libxl/Portfile
===================================================================
--- trunk/dports/textproc/libxl/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/libxl/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -31,9 +31,7 @@
configure.universal_archs i386 x86_64
# The pre-compiled library is linked with libstdc++.
-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libstdc++
-}
+configure.cxx_stdlib libstdc++
set libxl lib/libxl.dylib
Modified: trunk/dports/textproc/openjade/Portfile
===================================================================
--- trunk/dports/textproc/openjade/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/openjade/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -46,10 +46,9 @@
# Fix build failure on Tiger due to use of -isystem
compiler.blacklist gcc-4.0 gcc-3.3
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
- set cxx_stdlibflags "-stdlib=${configure.cxx_stdlib}"
+if {[string match *clang* ${configure.cxx}]} {
+ set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
configure.env-append LIBS="-L${prefix}/lib"
Modified: trunk/dports/textproc/sdcv/Portfile
===================================================================
--- trunk/dports/textproc/sdcv/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/sdcv/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -32,22 +32,8 @@
port:readline \
port:zlib
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
# C++11 is required.
# https://sourceforge.net/p/sdcv/bugs/7/
configure.compiler macports-gcc-4.8
Modified: trunk/dports/www/midori/Portfile
===================================================================
--- trunk/dports/www/midori/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/midori/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -46,22 +46,8 @@
# Needs zeitgeist-1.0, but we have zeitgeist-2.0 ... check a later version
configure.args-append --disable-zeitgeist
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/www/uzbl/Portfile
===================================================================
--- trunk/dports/www/uzbl/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/uzbl/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -45,22 +45,8 @@
eval destroot.args ${build.args}
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/webkit-gtk/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -89,23 +89,9 @@
--enable-webgl \
--disable-jit
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
pre-configure {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
ui_error "${subport} is not supported for this installation of MacPorts. It requires libc++ be selected as your C++ runtime. Please use ${subport}-2.0 instead"
error "unsupported configuration"
}
Modified: trunk/dports/www/webkit-gtk-2.0/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/webkit-gtk-2.0/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -82,23 +82,9 @@
--enable-geolocation \
--enable-webgl
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
pre-configure {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libc++"} {
+ if {${configure.cxx_stdlib} eq "libc++"} {
ui_error "${name} is provided for configurations that are unable to use webkit-gtk. Since you are on Mavericks or later (or have configured MacPorts to use libc++), please use webkit-gtk or webkit-gtk-devel instead."
error "unsupported configuration"
}
Modified: trunk/dports/www/webkit-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/webkit-gtk-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -89,23 +89,9 @@
--enable-webgl \
--disable-jit
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
pre-configure {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
ui_error "${subport} is not supported for this installation of MacPorts. It requires libc++ be selected as your C++ runtime. Please use ${subport}-2.0 instead"
error "unsupported configuration"
}
Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/x11/mesa/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -62,9 +62,8 @@
configure.cppflags-append -I${filespath}/include
}
-# TODO: Simplify once MacPorts 2.3 is released
set cxx_stdlibflags {}
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
Modified: trunk/dports/x11/rxvt-unicode/Portfile
===================================================================
--- trunk/dports/x11/rxvt-unicode/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/x11/rxvt-unicode/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
@@ -54,8 +54,7 @@
patchfiles patch-Makefile.in.diff
-# TODO: Simplify once MacPorts 2.3 is released
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
+if {[string match *clang* ${configure.cxx}]} {
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140621/e306de99/attachment-0001.html>
More information about the macports-changes
mailing list