Ticket #24439: arm-rtems-gcc_Portfile.patch

Portfile

@@ -3 +3 @@
 PortSystem                      1.0
 
 name                    arm-rtems-gcc
-version                 4.2.3
+version                 4.3.2
 
 # Parameters for this port.
 set newlibversion       1.16.0
-set crossgcc-target arm-rtems
+set crossgcc-target arm-rtems4.9
 set rtemsversion        4.9
-set default-languages --enable-languages="c,c++,objc"
+set default-languages --enable-languages="c,c++"
 
 description             gcc cross-compilers for arm-rtems, with newlib runtime library.
 long_description        gnu compilers collection (c, c++, fortran and objc) for \
@@ -25 +25 @@
                                         freebsd::rtems
 distfiles                       gcc-${version}.tar.bz2:gcc \
                                         newlib-${newlibversion}.tar.gz:newlib \
-                                        gcc-core-${version}-rtems4.9-20080205.diff:rtems \
-                                        newlib-${newlibversion}-rtems4.9-20080302.diff:rtems
+                                        gcc-core-${version}-rtems${rtemsversion}-20090825.diff:rtems \
+                                        newlib-${newlibversion}-rtems${rtemsversion}-20090324.diff:rtems
 extract.only            gcc-${version}.tar.gz newlib-${newlibversion}.tar.gz
 worksrcdir                      gcc-${version}
 checksums                       gcc-${version}.tar.bz2 \
-                    md5     ef2a4d9991b3644115456ea05b2b8163 \
-                    sha1    80b0df13fc9e311868022a3e86e673177397a917 \
-                    rmd160  70b589b79b97967857f2ec70ff8b2017c84c464d \
+                    md5     5dfac5da961ecd5f227c3175859a486d \
+#                    sha1    80b0df13fc9e311868022a3e86e673177397a917 \
+#                    rmd160  70b589b79b97967857f2ec70ff8b2017c84c464d \
                                         newlib-${newlibversion}.tar.gz \
                     md5     bf8f1f9e3ca83d732c00a79a6ef29bc4 \
-                    sha1    841edec33d19a9e549984982fb92445ee967e265 \
-                    rmd160  fa40ff43e858da3093c9f3b5b203724b9b327696 \
-                                        gcc-core-${version}-rtems4.9-20080205.diff \
-                    md5     d5a6a8c5973024476f0df6356b5e0424 \
-                    sha1    20d0ada57ad44d9f060e60e26acee57e46137ad6 \
-                    rmd160  c87a5703959dc319fad8e8b4804b8d4803cddc99 \
-                                        newlib-${newlibversion}-rtems4.9-20080302.diff \
-                    md5     a227456d0850e24a839634096b879c30 \
-                    sha1    4f8cd12ada4865b271eb4d4c7d80b520fb8d2bc6 \
-                    rmd160  81c76c584a6c76c9ea706bf9f0f2ba149303b289
-patchfiles                      patch-newlib-libc-configure.diff
+#                    sha1    841edec33d19a9e549984982fb92445ee967e265 \
+#                    rmd160  fa40ff43e858da3093c9f3b5b203724b9b327696 \
+                                        gcc-core-${version}-rtems${rtemsversion}-20090825.diff \
+                    md5     305a3c502b2698fbf480d03d877e4956 \
+#                    sha1    20d0ada57ad44d9f060e60e26acee57e46137ad6 \
+#                    rmd160  c87a5703959dc319fad8e8b4804b8d4803cddc99 \
+                                        newlib-${newlibversion}-rtems${rtemsversion}-20090324.diff \
+                    md5     f6b2d8558a77662f3ac4327cda84d10d \
+#                    sha1    4f8cd12ada4865b271eb4d4c7d80b520fb8d2bc6 \
+#                    rmd160  81c76c584a6c76c9ea706bf9f0f2ba149303b289
+#patchfiles                     patch-newlib-libc-configure.diff
 
 # All cross ports violate the mtree layout.
 destroot.violate_mtree  yes
@@ -58 +58 @@
                                         bin:${crossgcc-target}-ld:${crossgcc-target}-binutils \
                                         bin:${crossgcc-target}-nm:${crossgcc-target}-binutils \
                                         bin:${crossgcc-target}-ranlib:${crossgcc-target}-binutils
-depends_build           bin:msgfmt:gettext
+depends_build           bin:msgfmt:gettext port:gmp port:mpfr
+patchfiles      Make-lang.in.diff
+patch.dir       ${workpath}/gcc-${version}
 
 # gcc is .bz2, newlib is .gz.
 # let's extract only gcc with MacPorts infrastructure, we'll do newlib manually.
@@ -68 +70 @@
 # Extract newlib and create a symlink of newlib/newlib in gcc directory.
 post-extract    {
         system "cd ${workpath} && gzip -dc ${distpath}/newlib-${newlibversion}.tar.gz | tar -xf -"
-        system "ln -s ${workpath}/newlib-${newlibversion}/newlib ${workpath}/gcc-${version}/"
+        system "ln -sf ${workpath}/newlib-${newlibversion}/newlib ${workpath}/gcc-${version}/"
 }
 
 # Since we don't build gcc and binutils at the same time, gcc's Makefile will try to transform
@@ -95 +97 @@
                                 --mandir='${prefix}/share/man' \
                                 --target=${crossgcc-target} \
                                 --program-prefix=${crossgcc-target}- \
-                                --program-suffix=-${version} \
+#                               --program-suffix=-${version} \
                                 --with-included-gettext \
-                                --enable-obsolete \
+#                               --enable-obsolete \
                                 --with-newlib \
-                                --with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/ \
+                                --with-gnu-ld \
+                                --enable-threads \
+                                --disable-install-libiberty \
+#                               --with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/ \
                                 ${default-languages}
 
+if {$build_arch != ""} { 
+        configure.cc_archflags 
+        configure.cxx_archflags 
+        configure.objc_archflags 
+        if {${os.platform} == "darwin"} { 
+                configure.args-append --build=${build_arch}-apple-darwin${os.major} 
+        } 
+}
+ 
 build.dir       ${workpath}/build
 
 build.args              ${environment}
@@ -110 +124 @@
 pre-patch {
         # Additional patches for rtems.
         system "cd ${workpath}/gcc-${version} && \
-                patch -p1 < ${distpath}/gcc-core-${version}-rtems4.9-20080205.diff"
+                patch -p1 < ${distpath}/gcc-core-${version}-rtems${rtemsversion}-20090825.diff"
         system "cd ${workpath}/newlib-${newlibversion} && \
-                patch -p1 < ${distpath}/newlib-${newlibversion}-rtems4.9-20080302.diff"
+                patch -p1 < ${distpath}/newlib-${newlibversion}-rtems${rtemsversion}-20090324.diff"
 }
 
 post-patch {
@@ -247 +261 @@
 
         # (host) libiberty
         file delete "${destroot}/${prefix}/lib/libiberty.a"
+        file delete "${destroot}/${prefix}/lib/x86_64/libiberty.a"
+        file delete "${destroot}/${prefix}/lib/x86_64"
 
         # aliases for charsets (should already be there)
         file delete "${destroot}/${prefix}/lib/charset.alias"