Revision: 115389 https://trac.macports.org/changeset/115389 Author: jeremyhu@macports.org Date: 2013-12-31 22:47:49 -0800 (Tue, 31 Dec 2013) Log Message: ----------- db*: Link against the correct C++ runtime Modified Paths: -------------- 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 Modified: trunk/dports/databases/db44/Portfile =================================================================== --- trunk/dports/databases/db44/Portfile 2014-01-01 06:27:18 UTC (rev 115388) +++ trunk/dports/databases/db44/Portfile 2014-01-01 06:47:49 UTC (rev 115389) @@ -4,7 +4,7 @@ name db44 version 4.4.20 -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] {}] categories databases license Sleepycat @@ -59,6 +59,13 @@ --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}]} { + set cxx_stdlibflags -stdlib=${configure.cxx_stdlib} +} +configure.cxx ${configure.cxx} ${cxx_stdlibflags} + destroot.destdir \ prefix=${destroot}${prefix} \ docdir=${destroot}${prefix}/share/${name}-${version}/ Modified: trunk/dports/databases/db46/Portfile =================================================================== --- trunk/dports/databases/db46/Portfile 2014-01-01 06:27:18 UTC (rev 115388) +++ trunk/dports/databases/db46/Portfile 2014-01-01 06:47:49 UTC (rev 115389) @@ -7,7 +7,7 @@ name db46 version 4.6.21 #subport db46-java revision has been bumped, reset it on next version update -revision 8 +revision 9 set branch [join [lrange [split ${version} .] 0 1] {}] categories databases license Sleepycat @@ -72,6 +72,13 @@ --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}]} { + set cxx_stdlibflags -stdlib=${configure.cxx_stdlib} +} +configure.cxx ${configure.cxx} ${cxx_stdlibflags} + destroot.destdir \ prefix=${destroot}${prefix} \ docdir=${destroot}${prefix}/share/doc/${name}/ Modified: trunk/dports/databases/db47/Portfile =================================================================== --- trunk/dports/databases/db47/Portfile 2014-01-01 06:27:18 UTC (rev 115388) +++ trunk/dports/databases/db47/Portfile 2014-01-01 06:47:49 UTC (rev 115389) @@ -6,7 +6,7 @@ name db47 version 4.7.25 -revision 2 +revision 3 set branch [join [lrange [split ${version} .] 0 1] {}] categories databases license Sleepycat @@ -60,6 +60,13 @@ --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}]} { + set cxx_stdlibflags -stdlib=${configure.cxx_stdlib} +} +configure.cxx ${configure.cxx} ${cxx_stdlibflags} + destroot.destdir \ prefix=${destroot}${prefix} \ docdir=${destroot}${prefix}/share/doc/${name} Modified: trunk/dports/databases/db48/Portfile =================================================================== --- trunk/dports/databases/db48/Portfile 2014-01-01 06:27:18 UTC (rev 115388) +++ trunk/dports/databases/db48/Portfile 2014-01-01 06:47:49 UTC (rev 115389) @@ -7,7 +7,7 @@ name db48 version 4.8.30 -revision 2 +revision 3 set branch [join [lrange [split ${version} .] 0 1] {}] categories databases license Sleepycat @@ -40,6 +40,13 @@ --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}]} { + set cxx_stdlibflags -stdlib=${configure.cxx_stdlib} +} +configure.cxx ${configure.cxx} ${cxx_stdlibflags} + depends_run-append port:db_select select.group db select.file ${filespath}/db48 Modified: trunk/dports/databases/db51/Portfile =================================================================== --- trunk/dports/databases/db51/Portfile 2014-01-01 06:27:18 UTC (rev 115388) +++ trunk/dports/databases/db51/Portfile 2014-01-01 06:47:49 UTC (rev 115389) @@ -6,7 +6,7 @@ name db51 version 5.1.29 -revision 2 +revision 3 set branch [join [lrange [split ${version} .] 0 1] {}] categories databases license Sleepycat @@ -39,6 +39,13 @@ --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}]} { + set cxx_stdlibflags -stdlib=${configure.cxx_stdlib} +} +configure.cxx ${configure.cxx} ${cxx_stdlibflags} + destroot.destdir \ prefix=${destroot}${prefix} \ docdir=${destroot}${prefix}/share/doc/${name} Modified: trunk/dports/databases/db52/Portfile =================================================================== --- trunk/dports/databases/db52/Portfile 2014-01-01 06:27:18 UTC (rev 115388) +++ trunk/dports/databases/db52/Portfile 2014-01-01 06:47:49 UTC (rev 115389) @@ -6,7 +6,7 @@ name db52 version 5.2.42 -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] {}] categories databases license Sleepycat @@ -39,6 +39,13 @@ --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}]} { + set cxx_stdlibflags -stdlib=${configure.cxx_stdlib} +} +configure.cxx ${configure.cxx} ${cxx_stdlibflags} + destroot.destdir \ prefix=${destroot}${prefix} \ docdir=${destroot}${prefix}/share/doc/${name} Modified: trunk/dports/databases/db53/Portfile =================================================================== --- trunk/dports/databases/db53/Portfile 2014-01-01 06:27:18 UTC (rev 115388) +++ trunk/dports/databases/db53/Portfile 2014-01-01 06:47:49 UTC (rev 115389) @@ -6,7 +6,7 @@ name db53 version 5.3.21 -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] {}] categories databases license Sleepycat @@ -39,6 +39,13 @@ --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}]} { + set cxx_stdlibflags -stdlib=${configure.cxx_stdlib} +} +configure.cxx ${configure.cxx} ${cxx_stdlibflags} + destroot.destdir \ prefix=${destroot}${prefix} \ docdir=${destroot}${prefix}/share/doc/${name}
participants (1)
-
jeremyhu@macports.org