Ticket #49227: Portfile-gcc5.4.0-2.diff

Portfile

@@ -8 +8 @@
 
 epoch               2
 version             5.4.0
-revision            1
+revision            2
 platforms           darwin
 categories          lang
 maintainers         nomaintainer
@@ -23 +23 @@
                     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}
+                    gnu:gcc/gcc-${version} \
+                    ftp://sourceware.org/pub/java/
 
 distname            gcc-${version}
 use_bzip2           yes
 
-checksums           rmd160  7ae3413ca7e90bb21e65e637c02ddf2b675b45f4 \
-                    sha256  608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a
+distfiles           gcc-${version}.tar.bz2 \
+                    ecj-4.9.jar
+
+checksums           gcc-${version}.tar.bz2 \
+                    rmd160  7ae3413ca7e90bb21e65e637c02ddf2b675b45f4 \
+                    sha256  608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a \
+                    ecj-4.9.jar \
+                    rmd160  eb1b19d9ac0e9e265bf993f38b9576e3c710e91e \
+                    sha256  9506e75b862f782213df61af67338eb7a23c35ff425d328affc65585477d34cd
 
 depends_lib         port:cctools \
                     port:gmp \
@@ -47 +55 @@
 # <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
 patchfiles-append   macosx-version-min.patch
 
+# Provide linkage for MacPorts libiconv in gcj
+patchfiles-append   gcj-libiconv-linkage.patch
+
+extract.only        gcc-${version}.tar.bz2
+
 set major           [lindex [split ${version} .-] 0]
 
 platform darwin {
+    if {${os.major} > 14} {
+        # Hack around boehm-gc and associated gcj failures from recompilation
+        # of libunwind.dylib with Apple Clang 7.0 in El Capitan by reducing
+        # alignment to 2
+        patchfiles-append   boehm-gc-darwin15-hack.patch
+    }
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
 }
 
@@ -66 +85 @@
                     --disable-nls \
                     --program-suffix=-mp-${major} \
                     --with-gxx-include-dir=${prefix}/include/${name}/c++/ \
+                    --with-libiconv-prefix=${prefix} \
                     --with-gmp=${prefix} \
                     --with-mpfr=${prefix} \
                     --with-mpc=${prefix} \
@@ -91 +111 @@
                     OTOOL=${prefix}/bin/otool \
                     OTOOL64=${prefix}/bin/otool
 
+post-extract {
+    copy ${distpath}/ecj-4.9.jar ${worksrcpath}/ecj.jar
+}
+
 pre-configure {
     configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"