[101201] trunk/dports/lang/apple-gcc42/Portfile

jeremyhu at macports.org jeremyhu at macports.org
Sun Jan 6 01:25:06 PST 2013


Revision: 101201
          https://trac.macports.org/changeset/101201
Author:   jeremyhu at macports.org
Date:     2013-01-06 01:25:06 -0800 (Sun, 06 Jan 2013)
Log Message:
-----------
apple-gcc42: Support a +gpl3 variant to install changes from gcc-4.2.1 to gcc-4.2.4 (#37479)

Modified Paths:
--------------
    trunk/dports/lang/apple-gcc42/Portfile

Modified: trunk/dports/lang/apple-gcc42/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc42/Portfile	2013-01-06 09:24:16 UTC (rev 101200)
+++ trunk/dports/lang/apple-gcc42/Portfile	2013-01-06 09:25:06 UTC (rev 101201)
@@ -9,16 +9,24 @@
 revision		9
 categories		lang
 platforms		darwin
-license         GPL-2
+license			GPL-2
 maintainers		jeremyhu openmaintainer
-installs_libs	no
+installs_libs		no
 
 description		Apple's version of gcc 4.2
 long_description	Apple's version of the GNU compiler collection, \
 			version 4.2. Supports C, Objective-C, anc C++
 
+variant gpl3 description {Merge in changes from gcc-4.2.4} {
+	license 	GPL-3
+	set gcc_version	4.2.4
+	maintainers	googlemail.com:tobias.netzel openmaintainer
+
+	patchfiles-append    gcc-4.2.1-4.2.4.patch
+}
+
 homepage		http://opensource.apple.com/
-master_sites		gnu:/gcc/gcc-4.2.1:gnu \
+master_sites		gnu:/gcc/gcc-${gcc_version}:gnu \
 			http://opensource.apple.com/tarballs/gcc/:apple
 
 distname		gcc-${version}
@@ -30,10 +38,12 @@
 distfiles               ${dcore}:apple
 # ${dfort}:gnu ${djava}:gnu
 
-checksums           gcc-5666.3.tar.gz \
-                    md5     188c7769db5c898922b0976fab148a63 \
-                    sha1    292a0cfcfdc061cb083658efd9a3812a120a1f50 \
-                    rmd160  a01d000f89c0e89dd0079dcd202bba7629ba78dc
+checksums           gcc-4.2.1-4.2.4.patch \
+                    rmd160  17cb0baeab3ba081a7cbf87635c2794a76263f40 \
+                    sha256  f4c99f897acd2c64b872223b375e6e87add48fe0d6b017552855585250df6671 \
+                    gcc-5666.3.tar.gz \
+                    rmd160  a01d000f89c0e89dd0079dcd202bba7629ba78dc \
+                    sha256  6c46f4376d11ada5be0cfc3894b9296edf574af3c616ab71803ea78edfd7015b
 
 #                    gcc-fortran-4.2.1.tar.bz2 \
 #                    md5     2a91d467b50a404ca0cd3b10b413f9b2 \
@@ -44,6 +54,15 @@
 #                    sha1    4615c85ef9010304bf412adc2f2c33d256e177fd \
 #                    rmd160  bb4b256f7e7779361214593343821a127ee78d1a
 
+#                    gcc-fortran-4.2.4.tar.bz2 \
+#                    md5     d8896f33f91eca12135df2c1e5aa0887 \
+#                    sha1    ? \
+#                    rmd160  ? \
+#                    gcc-java-4.2.4.tar.bz2 \
+#                    md5     dd05ac72f8563c98af6946f9334668f1 \
+#                    sha1    ? \
+#                    rmd160  ?
+
 # Needed for gfortran:
 #files/other_langs.patch:
 #+  --with-gmp=$DEST_ROOT \
@@ -77,7 +96,7 @@
 # driverdriver-num_infiles.patch : Fix linking with no input files (ie all static archives passed with -l...)
 # driverdriver-armcheck.patch    : Build fix for the driverdriver when arm support is not available (eg: Tiger)
 
-patchfiles \
+patchfiles-append \
 	werror-c-incpath.patch \
 	werror-local-alloc.patch \
 	incpath.patch \
@@ -226,25 +245,25 @@
 destroot {}
 post-destroot {
     if {[string match "*i386*" ${build_targets}]} {
-        delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/as
-        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/as
-        delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/ld
-        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/ld
+        delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/as
+        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/as
+        delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/ld
+        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/ld
 
         # http://trac.macports.org/ticket/35770
-        delete  ${destroot}${prefix}/lib/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/libstdc++.dylib
-        ln -s /usr/lib/libstdc++.6.dylib ${destroot}${prefix}/lib/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/libstdc++.dylib
+        delete  ${destroot}${prefix}/lib/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/libstdc++.dylib
+        ln -s /usr/lib/libstdc++.6.dylib ${destroot}${prefix}/lib/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/libstdc++.dylib
     }
 
     if {[string match "*ppc*" ${build_targets}]} {
-        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/as
-        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/as
-        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/ld
-        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/ld
+        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/as
+        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/as
+        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/ld
+        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/ld
 
         # http://trac.macports.org/ticket/35770
-        delete  ${destroot}${prefix}/lib/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/libstdc++.dylib
-        ln -s /usr/lib/libstdc++.6.dylib ${destroot}${prefix}/lib/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/libstdc++.dylib
+        delete  ${destroot}${prefix}/lib/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/libstdc++.dylib
+        ln -s /usr/lib/libstdc++.6.dylib ${destroot}${prefix}/lib/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/libstdc++.dylib
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130106/958335cc/attachment.html>


More information about the macports-changes mailing list