[135479] trunk/dports/lang

ryandesign at macports.org ryandesign at macports.org
Fri Apr 24 09:50:59 PDT 2015


Revision: 135479
          https://trac.macports.org/changeset/135479
Author:   ryandesign at macports.org
Date:     2015-04-24 09:50:59 -0700 (Fri, 24 Apr 2015)
Log Message:
-----------
gcc5: update to 5.1.0 (#47546)
gcc6: new port, version 6-20150419
libgcc: move subport from gcc49 to gcc5
libgcc-devel: move subport from gcc5 to gcc6

Modified Paths:
--------------
    trunk/dports/lang/gcc49/Portfile
    trunk/dports/lang/gcc5/Portfile
    trunk/dports/lang/gcc6/Portfile

Added Paths:
-----------
    trunk/dports/lang/gcc6/
    trunk/dports/lang/gcc6/files/mp-gcc6

Removed Paths:
-------------
    trunk/dports/lang/gcc6/files/mp-gcc5

Modified: trunk/dports/lang/gcc49/Portfile
===================================================================
--- trunk/dports/lang/gcc49/Portfile	2015-04-24 16:49:10 UTC (rev 135478)
+++ trunk/dports/lang/gcc49/Portfile	2015-04-24 16:50:59 UTC (rev 135479)
@@ -6,7 +6,6 @@
 PortGroup compiler_blacklist_versions 1.0
 
 name                gcc49
-subport             libgcc {}
 
 epoch               2
 version             4.9.2
@@ -143,87 +142,6 @@
 
 destroot.target     install install-info-host
 
-if {${subport} eq "libgcc"} {
-    conflicts       libgcc-devel
-
-    # http://trac.macports.org/ticket/35770
-    # http://trac.macports.org/ticket/38814
-    # While there can be multiple versions of these runtimes in a single
-    # process, it is not possible to pass objects between different versions,
-    # so we simplify this by having the libgcc port provide the newest version
-    # of these runtimes for all versions of gcc to use.
-    #
-    # If there is a binary incompatible change to the runtime in a future
-    # version of gcc, then the latest version of gcc to provide a given ABI
-    # version should continue to provide a subport for that and older gcc
-    # versions.
-
-    depends_lib-delete path:lib/libgcc/libgcc_s.1.dylib:libgcc
-
-    configure.args-delete --libdir=${prefix}/lib/${name}
-    configure.args-append --libdir=${prefix}/lib/libgcc
-
-    configure.args-delete --enable-languages=c,c++,objc,obj-c++,lto,fortran,java
-    configure.args-append --enable-languages=c,c++,objc,obj-c++,lto,fortran
-
-    # TODO: Possibly disable bootstrap with appropriate configure flags.
-    #       the problem is that libstdc++'s configure script tests for tls support
-    #       using the running compiler (not gcc for which libstdc++ is being built).
-    #       Thus when we build with clang, we get a mismatch
-    # http://trac.macports.org/ticket/36116
-    #compiler.blacklist-append {clang < 425}
-    #configure.args-append --disable-bootstrap
-    #build.target        all
-
-    post-destroot {
-        file mkdir ${destroot}${prefix}/lib/libgcc.merged
-
-        # Note that we really don't want to include libgcc_ext.10.[45].dylib here, but install_name_tool
-        # doesn't know how to change the id of stubs, and it's easier than recreating them for each
-        # gcc port.
-        set dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgfortran.3.dylib libquadmath.0.dylib libstdc++.6.dylib libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.0.dylib libatomic.1.dylib}
-
-        foreach dylib ${dylibs} {
-            # Different OS versions (eg: Leopard) or architectures (eg: PPC) don't produce all the dylibs
-            # https://trac.macports.org/ticket/40098
-            # https://trac.macports.org/ticket/40100
-            if {! [file exists ${destroot}${prefix}/lib/libgcc/${dylib}]} {
-                continue
-            }
-
-            move ${destroot}${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/libgcc.merged
-            if {[variant_isset universal]} {
-                foreach archdir [glob ${destroot}${prefix}/lib/libgcc/*/] {
-                    set archdir_nodestroot [string map "${destroot}/ /" ${archdir}]
-                    if {[file exists ${archdir}/${dylib}]} {
-                        system "install_name_tool -id ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}"
-                        foreach link ${dylibs} {
-                            system "install_name_tool -change ${archdir_nodestroot}${link} ${prefix}/lib/libgcc/${link} ${archdir}/${dylib}"
-                        }
-                        system "lipo -create -output ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib} ${archdir}/${dylib} && mv ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
-                    }
-                }
-            }
-
-            # strip debug symbols to supress debugger warnings:
-            # http://trac.macports.org/attachment/ticket/34831
-            if {! [string match *libgcc_ext* ${dylib}]} {
-                system "strip -x ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
-            }
-        }
-
-        file delete -force ${destroot}${prefix}/bin              
-        file delete -force ${destroot}${prefix}/share
-        file delete -force ${destroot}${prefix}/include
-        file delete -force ${destroot}${prefix}/lib/libgcc
-        file delete -force ${destroot}${prefix}/libexec
-
-        move ${destroot}${prefix}/lib/libgcc.merged ${destroot}${prefix}/lib/libgcc
-
-        # For binary compatibility with binaries that linked against the old libstdcxx port
-        ln -s libgcc/libstdc++.6.dylib ${destroot}${prefix}/lib/libstdc++.6.dylib
-    }
-} else {
 post-destroot {
     file delete ${destroot}${prefix}/share/info/dir
 
@@ -257,8 +175,6 @@
 select.group        gcc
 select.file         ${filespath}/mp-${name}
 
-}
-
 platform powerpc {
     configure.universal_archs ppc ppc64
 }

Modified: trunk/dports/lang/gcc5/Portfile
===================================================================
--- trunk/dports/lang/gcc5/Portfile	2015-04-24 16:49:10 UTC (rev 135478)
+++ trunk/dports/lang/gcc5/Portfile	2015-04-24 16:50:59 UTC (rev 135479)
@@ -6,39 +6,37 @@
 PortGroup compiler_blacklist_versions 1.0
 
 name                gcc5
-subport             libgcc-devel {}
+subport             libgcc {}
 
-epoch               1
-version             5-20150421
+epoch               2
+version             5.1.0
 platforms           darwin
 categories          lang
 maintainers         mww openmaintainer
 # an exception in the license allows dependents to not be GPL
 license             {GPL-3+ Permissive}
-description         The GNU compiler collection, prerelease BETA
+description         The GNU compiler collection
 long_description    The GNU compiler collection, including front ends for \
-                    C, C++, Objective-C, Objective-C++, Fortran and Java. \
-                    This is a prerelease BETA version!
+                    C, C++, Objective-C, Objective-C++, Fortran and Java.
 
 homepage            http://gcc.gnu.org/
-master_sites        http://gcc.petsads.us/snapshots/${version} \
-                    ftp://ftp.gwdg.de/pub/linux/gcc/snapshots/${version}/ \
-                    ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/snapshots/${version}/ \
-                    ftp://gcc.gnu.org/pub/gcc/snapshots/${version}/ \
-                    http://mirrors-us.seosue.com/gcc/snapshots/${version}/ \
-                    http://gcc.skazkaforyou.com/snapshots/${version}/
+master_sites        ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/releases/gcc-${version}/ \
+                    ftp://ftp.gwdg.de/pub/linux/gcc/releases/gcc-${version}/ \
+                    ftp://gcc.ftp.nluug.nl/mirror/languages/gcc/releases/gcc-${version}/ \
+                    ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/ \
+                    gnu:gcc/gcc-${version}
 
 distname            gcc-${version}
 use_bzip2           yes
 
-checksums           rmd160  949bfc8493d43697624f113f003f93c82a0dfef2 \
-                    sha256  b738e5f202dc99709c8f11d0d7f1e1274026d322eabeb1aec2a0ca6b321f4716
+checksums           rmd160  17a9623f384ce10415a603042e0592c9b4956078 \
+                    sha256  b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
 
 depends_lib         port:cctools \
                     port:gmp \
                     path:lib/pkgconfig/isl.pc:isl \
                     port:ld64 \
-                    port:libgcc-devel \
+                    path:lib/libgcc/libgcc_s.1.dylib:libgcc \
                     port:libiconv \
                     port:libmpc \
                     port:mpfr
@@ -59,7 +57,7 @@
 
 configure.dir       ${workpath}/build
 configure.cmd       ${worksrcpath}/configure
-configure.args      --enable-languages=c,c++,objc,obj-c++,fortran,java \
+configure.args      --enable-languages=c,c++,objc,obj-c++,lto,fortran,java \
                     --libdir=${prefix}/lib/${name} \
                     --includedir=${prefix}/include/${name} \
                     --infodir=${prefix}/share/info \
@@ -116,8 +114,8 @@
 
 destroot.target     install install-info-host
 
-if {${subport} eq "libgcc-devel"} {
-    conflicts       libgcc
+if {${subport} eq "libgcc"} {
+    conflicts       libgcc-devel
 
     # http://trac.macports.org/ticket/35770
     # http://trac.macports.org/ticket/38814
@@ -131,7 +129,7 @@
     # version should continue to provide a subport for that and older gcc
     # versions.
 
-    depends_lib-delete port:libgcc-devel
+    depends_lib-delete path:lib/libgcc/libgcc_s.1.dylib:libgcc
 
     configure.args-delete --libdir=${prefix}/lib/${name}
     configure.args-append --libdir=${prefix}/lib/libgcc
@@ -257,5 +255,5 @@
 configure.universal_args
 
 livecheck.type      regex
-livecheck.url       ftp://gcc.gnu.org/pub/gcc/snapshots/
-livecheck.regex     LATEST-${major} -> (${major}-\[0-9\]+)
+livecheck.url       http://ftp.gnu.org/gnu/gcc/
+livecheck.regex     gcc-(${major}\\.\[0-9.\]+)/

Modified: trunk/dports/lang/gcc6/Portfile
===================================================================
--- trunk/dports/lang/gcc5/Portfile	2015-04-23 21:48:44 UTC (rev 135456)
+++ trunk/dports/lang/gcc6/Portfile	2015-04-24 16:50:59 UTC (rev 135479)
@@ -5,11 +5,11 @@
 PortGroup select 1.0
 PortGroup compiler_blacklist_versions 1.0
 
-name                gcc5
+name                gcc6
 subport             libgcc-devel {}
 
 epoch               1
-version             5-20150421
+version             6-20150419
 platforms           darwin
 categories          lang
 maintainers         mww openmaintainer
@@ -31,8 +31,8 @@
 distname            gcc-${version}
 use_bzip2           yes
 
-checksums           rmd160  949bfc8493d43697624f113f003f93c82a0dfef2 \
-                    sha256  b738e5f202dc99709c8f11d0d7f1e1274026d322eabeb1aec2a0ca6b321f4716
+checksums           rmd160  60b36d20c7d7f9ea464a7d19eee383e6099cc26b \
+                    sha256  e34728e2f7d2e7faab1d5824e0619b9738ff25c569d0f44893bc4bd215b23017
 
 depends_lib         port:cctools \
                     port:gmp \
@@ -59,7 +59,7 @@
 
 configure.dir       ${workpath}/build
 configure.cmd       ${worksrcpath}/configure
-configure.args      --enable-languages=c,c++,objc,obj-c++,fortran,java \
+configure.args      --enable-languages=c,c++,objc,obj-c++,lto,fortran,java \
                     --libdir=${prefix}/lib/${name} \
                     --includedir=${prefix}/include/${name} \
                     --infodir=${prefix}/share/info \

Deleted: trunk/dports/lang/gcc6/files/mp-gcc5
===================================================================
--- trunk/dports/lang/gcc5/files/mp-gcc5	2015-04-23 21:48:44 UTC (rev 135456)
+++ trunk/dports/lang/gcc6/files/mp-gcc5	2015-04-24 16:50:59 UTC (rev 135479)
@@ -1,7 +0,0 @@
-bin/gcc-mp-5
-bin/cpp-mp-5
-bin/c++-mp-5
-bin/g++-mp-5
-bin/gcj-mp-5
-bin/gcov-mp-5
-bin/gfortran-mp-5

Copied: trunk/dports/lang/gcc6/files/mp-gcc6 (from rev 135456, trunk/dports/lang/gcc5/files/mp-gcc5)
===================================================================
--- trunk/dports/lang/gcc6/files/mp-gcc6	                        (rev 0)
+++ trunk/dports/lang/gcc6/files/mp-gcc6	2015-04-24 16:50:59 UTC (rev 135479)
@@ -0,0 +1,7 @@
+bin/gcc-mp-6
+bin/cpp-mp-6
+bin/c++-mp-6
+bin/g++-mp-6
+bin/gcj-mp-6
+bin/gcov-mp-6
+bin/gfortran-mp-6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150424/5c251723/attachment.html>


More information about the macports-changes mailing list