gcc4?: Make libstdcxx builds faster, workaround bug in base depspec f…

…or the libstdcxx dependency git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@97700 d073be05-634f-4543-b044-5fe20cf6d1d6
alterae · Sep 12, 2012 · 1ec2b54 · 1ec2b54
1 parent 5e3961e
commit 1ec2b54
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/lang/gcc42/Portfile b/lang/gcc42/Portfile
@@ -41,7 +41,7 @@ use_bzip2		yes
 universal_variant	no
 
 depends_lib		port:gmp port:mpfr port:libiconv
-depends_run		port:gcc_select port:ld64 port:cctools path:lib/libstdc++.dylib:libstdcxx
+depends_run		port:gcc_select port:ld64 port:cctools path:lib/.libstdcxx:libstdcxx
 
 depends_skip_archcheck-append gcc_select ld64 cctools
 

diff --git a/lang/gcc43/Portfile b/lang/gcc43/Portfile
@@ -54,7 +54,7 @@ checksums           gcc-core-${version}.tar.bz2 \
                     rmd160  cde38f66b4b952f52938dc50d7606a0e1ccc7d2f
 
 depends_lib         port:gmp port:mpfr port:libiconv
-depends_run         port:gcc_select port:ld64 port:cctools path:lib/libstdc++.dylib:libstdcxx
+depends_run         port:gcc_select port:ld64 port:cctools path:lib/.libstdcxx:libstdcxx
 
 depends_skip_archcheck-append gcc_select ld64 cctools
 

diff --git a/lang/gcc44/Portfile b/lang/gcc44/Portfile
@@ -55,7 +55,7 @@ checksums           gcc-core-4.4.7.tar.bz2 \
                     rmd160  660d8e2f8162458e463de6195e58391ee711ed59
 
 depends_lib         port:gmp port:mpfr port:libiconv
-depends_run         port:gcc_select port:ld64 port:cctools path:lib/libstdc++.dylib:libstdcxx
+depends_run         port:gcc_select port:ld64 port:cctools path:lib/.libstdcxx:libstdcxx
 
 depends_skip_archcheck-append gcc_select ld64 cctools
 

diff --git a/lang/gcc45/Portfile b/lang/gcc45/Portfile
@@ -60,7 +60,7 @@ checksums           gcc-core-${version}.tar.bz2 \
                     sha256  98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
 
 depends_lib         port:gmp port:mpfr port:libiconv port:libmpc port:ppl
-depends_run         port:gcc_select port:ld64 port:cctools path:lib/libstdc++.dylib:libstdcxx
+depends_run         port:gcc_select port:ld64 port:cctools path:.libstdcxx:libstdcxx
 
 depends_skip_archcheck-append gcc_select ld64 cctools
 

diff --git a/lang/gcc46/Portfile b/lang/gcc46/Portfile
@@ -46,7 +46,7 @@ checksums           [suffix ${distname}] \
                     sha256  98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
 
 depends_lib         port:gmp port:mpfr port:libiconv port:libmpc port:ppl port:cloog
-depends_run         port:gcc_select port:ld64 port:cctools path:lib/libstdc++.dylib:libstdcxx
+depends_run         port:gcc_select port:ld64 port:cctools path:lib/.libstdcxx:libstdcxx
 
 depends_skip_archcheck-append gcc_select ld64 cctools
 

diff --git a/lang/gcc47/Portfile b/lang/gcc47/Portfile
@@ -7,7 +7,7 @@ name                gcc47
 subport             libstdcxx {}
 epoch               1
 version             4.7.1
-revision            5
+revision            6
 platforms           darwin
 categories          lang
 maintainers         mww openmaintainer
@@ -45,7 +45,7 @@ checksums           [suffix ${distname}] \
                     sha256  98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
 
 depends_lib         port:gmp port:mpfr port:libiconv port:libmpc port:ppl port:cloog
-depends_run         port:gcc_select port:ld64 port:cctools path:lib/libstdc++.dylib:libstdcxx
+depends_run         port:gcc_select port:ld64 port:cctools path:lib/.libstdcxx:libstdcxx
 
 depends_skip_archcheck-append gcc_select ld64 cctools
 
@@ -127,12 +127,18 @@ if {${subport} == "libstdcxx"} {
     configure.args-delete --enable-languages=c,c++,objc,obj-c++,lto,fortran,java
     configure.args-append --enable-languages=c++
 
+    configure.args-append --disable-bootstrap
+
+    build.target        all
     destroot.target     install-target-libstdc++-v3
 
     post-destroot {
         eval delete [glob ${destroot}${prefix}/lib/*{a,py}]
         file delete -force ${destroot}${prefix}/share/gcc-${major}
         file delete -force ${destroot}${prefix}/include/${name}
+
+        # base doesn't like the + in this depspec path:lib/libstdc++.dylib:libstdcxx
+        system "touch ${destroot}${prefix}/lib/.libstdcxx"
     }
 } else {
 post-destroot {

diff --git a/lang/gcc48/Portfile b/lang/gcc48/Portfile
@@ -6,7 +6,7 @@ PortGroup select 1.0
 name                gcc48
 subport             libstdcxx-devel {}
 version             4.8-20120909
-revision            3
+revision            4
 platforms           darwin
 categories          lang
 maintainers         mww openmaintainer
@@ -108,12 +108,18 @@ if {${subport} == "libstdcxx-devel"} {
     configure.args-delete --enable-languages=c,c++,objc,obj-c++,lto,fortran,java
     configure.args-append --enable-languages=c++
 
+    configure.args-append --disable-bootstrap
+
+    build.target        all
     destroot.target     install-target-libstdc++-v3
 
     post-destroot {
         eval delete [glob ${destroot}${prefix}/lib/*{a,py}]
         file delete -force ${destroot}${prefix}/share/gcc-${major}
         file delete -force ${destroot}${prefix}/include/${name}
+
+        # base doesn't like the + in this depspec path:lib/libstdc++.dylib:libstdcxx
+        system "touch ${destroot}${prefix}/lib/.libstdcxx"
     }
 } else {
 post-destroot {