Changeset 80294

Timestamp:

07/08/11 11:44:01 (4 years ago)

Author:

jeremyhu@…

Message:

apple-gcc42: No effective change, but provides a starting point towards gcj and gfortran if anyone wants to continue the work

Location:

trunk/dports/lang/apple-gcc42

Files:

• Portfile (modified) (5 diffs)
• files/other_langs.patch (added)
• files/suffix.patch (modified) (1 diff)

trunk/dports/lang/apple-gcc42/Portfile

@@ -6 +6 @@
 name                    apple-gcc42
 version                 5666.3
+set gcc_version         4.2.1
 revision                1
 categories              lang
@@ -15 +16 @@
 
 homepage                http://opensource.apple.com/
-master_sites            http://opensource.apple.com/tarballs/gcc/
+master_sites            gnu:/gcc/gcc-4.2.1:gnu \
+                        http://opensource.apple.com/tarballs/gcc/:apple
+
 distname                gcc-${version}
-checksums               md5     188c7769db5c898922b0976fab148a63 \
-                        sha1    292a0cfcfdc061cb083658efd9a3812a120a1f50 \
-                        rmd160  a01d000f89c0e89dd0079dcd202bba7629ba78dc
+
+set dcore               ${distname}.tar.gz
+set dfort               gcc-fortran-${gcc_version}.tar.bz2
+set djava               gcc-java-${gcc_version}.tar.bz2
+
+distfiles               ${dcore}:apple
+# ${dfort}:gnu ${djava}:gnu
+
+checksums           gcc-5666.3.tar.gz \
+                    md5     188c7769db5c898922b0976fab148a63 \
+                    sha1    292a0cfcfdc061cb083658efd9a3812a120a1f50 \
+                    rmd160  a01d000f89c0e89dd0079dcd202bba7629ba78dc
+
+#                    gcc-fortran-4.2.1.tar.bz2 \
+#                    md5     2a91d467b50a404ca0cd3b10b413f9b2 \
+#                    sha1    37a0466b393ade9291dcec315c69c371e42db7f5 \
+#                    rmd160  2475594dad66277fd0c5fe42389fb8fa2665e5ce \
+#                    gcc-java-4.2.1.tar.bz2 \
+#                    md5     3fc64e96388b939fada65fe3bffb5924 \
+#                    sha1    4615c85ef9010304bf412adc2f2c33d256e177fd \
+#                    rmd160  bb4b256f7e7779361214593343821a127ee78d1a
+
+# Needed for gfortran:
+# gmp and mpfr are not universal
+#universal_variant       no
+#depends_lib             port:gmp port:mpfr port:libiconv
 
 depends_run             port:gcc_select
@@ -37 +63 @@
 # suffix.patch             : Make binaries end in -apple-4.2
 # stage1-cc.patch          : Use $CC for our stage1 compiler
+# other_langs.patch        : Add support for gcj and gfortran to build_gcc
 # makeinfo.patch           : Fix version detection for makeinfo in configure scripts
 # werror-*.patch           : Fix compilation errors when building for x86_64
@@ -46 +73 @@
         makeinfo.patch \
         stage1-cc.patch \
+        other_langs.patch \
         werror-c-incpath.patch \
         werror-local-alloc.patch
+
+# gcj fails to build:
+# gcc/java/lang.c: In function 'java_init':
+# gcc/java/lang.c:378: error: 'force_align_functions_log' undeclared (first use in this function)
+# gcc/java/lang.c:378: error: (Each undeclared identifier is reported only once
+# gcc/java/lang.c:378: error: for each function it appears in.)
+#
+# gfortrain fails to link due to functionality moving around in core in a way the module doesn't expect
+
+#extract {
+#       system "cd ${workpath} && tar xzf ${distpath}/${dfort}"
+#       system "cd ${workpath} && tar xzf ${distpath}/${djava}"
+#       file rename ${workpath}/gcc-${gcc_version} ${worksrcpath}
+#       system "cd ${workpath} && tar xjf ${distpath}/${dcore}"
+#}
 
 post-patch {
@@ -78 +121 @@
         LIBRARY_PATH="/usr/lib" \
         CPATH="/usr/include" \
-        PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+        PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
+        LANGUAGES="c,c++,objc,obj-c++"
 
 #       MAKEINFO=${prefix}/bin/makeinfo

trunk/dports/lang/apple-gcc42/files/suffix.patch

@@ -6 +6 @@
    --enable-languages=$LANGUAGES \
 -  --program-transform-name=/^[cg][^.-]*$/s/$/-$MAJ_VERS/ \
-+  --libexecdir=\${prefix}/libexec/apple-gcc42 \
-+  --libdir=\${prefix}/lib/apple-gcc42 \
-+  --includedir=\${prefix}/include/apple-gcc42 \
++  --libexecdir=$DEST_ROOT/libexec/apple-gcc42 \
++  --libdir=$DEST_ROOT/lib/apple-gcc42 \
++  --includedir=$DEST_ROOT/include/apple-gcc42 \
 +  --program-suffix=-apple-$MAJ_VERS \
    --with-slibdir=/usr/lib \