[98042] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sun Sep 23 18:22:57 PDT 2012
Revision: 98042
http://trac.macports.org//changeset/98042
Author: jeremyhu at macports.org
Date: 2012-09-23 18:22:57 -0700 (Sun, 23 Sep 2012)
Log Message:
-----------
gcc*: Fix +universal g++ to use libstdcxx, bump gcc48 to 20120916
Modified Paths:
--------------
trunk/dports/lang/gcc42/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
Modified: trunk/dports/lang/gcc42/Portfile
===================================================================
--- trunk/dports/lang/gcc42/Portfile 2012-09-23 20:42:20 UTC (rev 98041)
+++ trunk/dports/lang/gcc42/Portfile 2012-09-24 01:22:57 UTC (rev 98042)
@@ -5,7 +5,7 @@
name gcc42
version 4.2.4
-revision 6
+revision 7
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -116,6 +116,18 @@
file delete -force ${destroot}${prefix}/share/man/man7 \
${destroot}${prefix}/share/info
+ if {[variant_isset universal]} {
+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
+ if {[file exists ${archdir}/libstdc++.6.dylib]} {
+ eval delete [glob ${archdir}/libstdc++*]
+
+ # This symlink is provided as a transition aide and will be removed
+ # with a future revision of this port.
+ ln -s ${prefix}/lib/libstdc++.6.dylib ${archdir}/libstdc++.6.dylib
+ }
+ }
+ }
+
# http://trac.macports.org/ticket/35770
eval delete [glob ${destroot}${prefix}/lib/${name}/libstdc++*]
Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile 2012-09-23 20:42:20 UTC (rev 98041)
+++ trunk/dports/lang/gcc43/Portfile 2012-09-24 01:22:57 UTC (rev 98042)
@@ -5,7 +5,7 @@
name gcc43
version 4.3.6
-revision 6
+revision 7
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -136,6 +136,18 @@
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
+ if {[variant_isset universal]} {
+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
+ if {[file exists ${archdir}/libstdc++.6.dylib]} {
+ eval delete [glob ${archdir}/libstdc++*]
+
+ # This symlink is provided as a transition aide and will be removed
+ # with a future revision of this port.
+ ln -s ${prefix}/lib/libstdc++.6.dylib ${archdir}/libstdc++.6.dylib
+ }
+ }
+ }
+
# http://trac.macports.org/ticket/35770
eval delete [glob ${destroot}${prefix}/lib/${name}/libstdc++*]
Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile 2012-09-23 20:42:20 UTC (rev 98041)
+++ trunk/dports/lang/gcc44/Portfile 2012-09-24 01:22:57 UTC (rev 98042)
@@ -6,7 +6,7 @@
name gcc44
epoch 1
version 4.4.7
-revision 5
+revision 6
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -141,6 +141,18 @@
file rename ${destroot}${prefix}/share/python/classfile.py \
${destroot}${prefix}/share/python/classfile-44.py
+ if {[variant_isset universal]} {
+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
+ if {[file exists ${archdir}/libstdc++.6.dylib]} {
+ eval delete [glob ${archdir}/libstdc++*]
+
+ # This symlink is provided as a transition aide and will be removed
+ # with a future revision of this port.
+ ln -s ${prefix}/lib/libstdc++.6.dylib ${archdir}/libstdc++.6.dylib
+ }
+ }
+ }
+
# http://trac.macports.org/ticket/35770
eval delete [glob ${destroot}${prefix}/lib/${name}/libstdc++*]
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2012-09-23 20:42:20 UTC (rev 98041)
+++ trunk/dports/lang/gcc45/Portfile 2012-09-24 01:22:57 UTC (rev 98042)
@@ -6,7 +6,7 @@
name gcc45
epoch 1
version 4.5.4
-revision 5
+revision 6
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -146,6 +146,18 @@
file rename ${destroot}${prefix}/share/python/classfile.py \
${destroot}${prefix}/share/python/classfile-45.py
+ if {[variant_isset universal]} {
+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
+ if {[file exists ${archdir}/libstdc++.6.dylib]} {
+ eval delete [glob ${archdir}/libstdc++*]
+
+ # This symlink is provided as a transition aide and will be removed
+ # with a future revision of this port.
+ ln -s ${prefix}/lib/libstdc++.6.dylib ${archdir}/libstdc++.6.dylib
+ }
+ }
+ }
+
# http://trac.macports.org/ticket/35770
eval delete [glob ${destroot}${prefix}/lib/${name}/libstdc++*]
Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile 2012-09-23 20:42:20 UTC (rev 98041)
+++ trunk/dports/lang/gcc46/Portfile 2012-09-24 01:22:57 UTC (rev 98042)
@@ -6,7 +6,7 @@
name gcc46
epoch 1
version 4.6.3
-revision 7
+revision 8
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -125,6 +125,18 @@
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
+ if {[variant_isset universal]} {
+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
+ if {[file exists ${archdir}/libstdc++.6.dylib]} {
+ eval delete [glob ${archdir}/libstdc++*]
+
+ # This symlink is provided as a transition aide and will be removed
+ # with a future revision of this port.
+ ln -s ${prefix}/lib/libstdc++.6.dylib ${archdir}/libstdc++.6.dylib
+ }
+ }
+ }
+
# http://trac.macports.org/ticket/35770
eval delete [glob ${destroot}${prefix}/lib/${name}/libstdc++*]
Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile 2012-09-23 20:42:20 UTC (rev 98041)
+++ trunk/dports/lang/gcc47/Portfile 2012-09-24 01:22:57 UTC (rev 98042)
@@ -9,7 +9,7 @@
# When version is updated, please delete the separate revision for libstdcxx below (and delete this comment)
version 4.7.1
-revision 6
+revision 7
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -181,6 +181,18 @@
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
+ if {[variant_isset universal]} {
+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
+ if {[file exists ${archdir}/libstdc++.6.dylib]} {
+ eval delete [glob ${archdir}/libstdc++*]
+
+ # This symlink is provided as a transition aide and will be removed
+ # with a future revision of this port.
+ ln -s ${prefix}/lib/libstdc++.6.dylib ${archdir}/libstdc++.6.dylib
+ }
+ }
+ }
+
# http://trac.macports.org/ticket/35770
eval delete [glob ${destroot}${prefix}/lib/${name}/libstdc++*]
Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- trunk/dports/lang/gcc48/Portfile 2012-09-23 20:42:20 UTC (rev 98041)
+++ trunk/dports/lang/gcc48/Portfile 2012-09-24 01:22:57 UTC (rev 98042)
@@ -6,9 +6,7 @@
name gcc48
subport libstdcxx-devel {}
-# When version is updated, please delete the separate revision for libstdcxx below (and delete this comment)
-version 4.8-20120909
-revision 4
+version 4.8-20120916
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -27,8 +25,8 @@
distname gcc-${version}
-checksums rmd160 35cd54340b158c8fcccbf5f4be599f141d60f694 \
- sha256 7afd0b9143a541702f767d69610b5648e7e97fdd66b02ca910175e0bad2b31c0
+checksums rmd160 65ed9cd112f42f04adb7fb44628bc04b9053bcf1 \
+ sha256 0c70f697e3b97ca861d2f89c44431d32025cdeefe36dfbe29ff07042e886d3bf
supported_archs i386 x86_64
@@ -107,10 +105,6 @@
if {${subport} == "libstdcxx-devel"} {
conflicts libstdcxx
- # Revision subport separately from port for now in order to not force
- # rebuilds of gcc while ironing out the wrinkles in libstdcxx
- revision 101
-
# We might want to consider adding this patch to the gcc subport as well
# since it removes stuff that doesn't really make sense in the context of
# MacPorts
@@ -162,6 +156,18 @@
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
+ if {[variant_isset universal]} {
+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
+ if {[file exists ${archdir}/libstdc++.6.dylib]} {
+ eval delete [glob ${archdir}/libstdc++*]
+
+ # This symlink is provided as a transition aide and will be removed
+ # with a future revision of this port.
+ ln -s ${prefix}/lib/libstdc++.6.dylib ${archdir}/libstdc++.6.dylib
+ }
+ }
+ }
+
# http://trac.macports.org/ticket/35770
eval delete [glob ${destroot}${prefix}/lib/${name}/libstdc++*]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120923/46c8f2f7/attachment-0001.html>
More information about the macports-changes
mailing list