Changeset 68780 for trunk/dports

Timestamp:

Jun 13, 2010, 2:22:16 PM (14 years ago)

Author:

ryandesign@…

Message:

gcc45: maintainer-approved update:

• fix bootstrap comparison failure (#24664)
• add ecj1 (#22066)
• use --enable-fully-dynamic-string (#25205)

Location:

trunk/dports/lang/gcc45

Files:

• Portfile (modified) (7 diffs)
• files/tls_configure_fix.diff (copied) (copied from trunk/dports/lang/gcc46/files/tls_configure_fix.diff)

trunk/dports/lang/gcc45/Portfile

@@ -4 +4 @@
 
 name                    gcc45
+epoch                   1
 version                 4.5.0
-revision                2
-epoch                   1
+revision                3
 platforms               darwin
 categories              lang
@@ -16 +16 @@
 
 homepage                http://gcc.gnu.org/
-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}
+master_sites            ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/releases/gcc-${version}/:gcc \
+                        ftp://ftp.gwdg.de/pub/linux/gcc/releases/gcc-${version}/:gcc \
+                        ftp://gcc.ftp.nluug.nl/mirror/languages/gcc/releases/gcc-${version}/:gcc \
+                        ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/:gcc \
+                        gnu:/gcc/gcc-${version}:gcc \
+                        ftp://sourceware.org/pub/java/:ecj
 
 set dcore               gcc-core-${version}.tar.bz2
@@ -27 +28 @@
 set djava               gcc-java-${version}.tar.bz2
 set dobjc               gcc-objc-${version}.tar.bz2
-distfiles               ${dcore} ${dfort} ${dcxx} ${djava} ${dobjc}
+set ecj                 ecj-4.5.jar
+distfiles               ${dcore}:gcc ${dfort}:gcc ${dcxx}:gcc ${djava}:gcc ${dobjc}:gcc ${ecj}:ecj
+extract.only            ${dcore} ${dfort} ${dcxx} ${djava} ${dobjc}
 
 checksums           gcc-core-${version}.tar.bz2 \
@@ -48 +51 @@
                     md5     8d8c01b6631b020cc6c167860fde2398 \
                     sha1    bca51ee80f3bc240b6dd84535d49423423eb457e \
-                    rmd160  9512ff932be7fa36d3f2c8b3ca3e41089ac5a6e8
+                    rmd160  9512ff932be7fa36d3f2c8b3ca3e41089ac5a6e8 \
+                    ${ecj} \
+                    md5     d7cd6a27c8801e66cbaa964a039ecfdb \
+                    sha1    58c1d79c64c8cd718550f32a932ccfde8d1e6449 \
+                    rmd160  d3f4da657f086b6423f74e93f001132f4855368a
 
 use_bzip2               yes
@@ -56 +63 @@
 
 depends_lib             port:gmp port:mpfr port:libiconv port:libmpc
+
+patchfiles              tls_configure_fix.diff
+patch.dir               ${workpath}/gcc-${version}
 
 set major               4.5
@@ -67 +77 @@
     configure.objc_archflags
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
+}
+
+post-extract {
+        copy ${distpath}/${ecj} ${workpath}/gcc-${version}/ecj.jar
 }
 
@@ -123 +137 @@
 }
 
+platform darwin 10 {
+        configure.args-append --enable-fully-dynamic-string
+}
+
 livecheck.type  regex
 livecheck.url   http://gcc.gnu.org/gcc-4.5/