[33155] trunk/dports/lang/gcc41

mww at macports.org mww at macports.org
Sat Jan 19 07:19:54 PST 2008


Revision: 33155
          http://trac.macosforge.org/projects/macports/changeset/33155
Author:   mww at macports.org
Date:     2008-01-19 07:19:52 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------
enable all languages again, fix build on 10.5 -- thanks to roland at lrde.epita.fr (#13314)

Modified Paths:
--------------
    trunk/dports/lang/gcc41/Portfile

Added Paths:
-----------
    trunk/dports/lang/gcc41/files/patch-configure-texinfo
    trunk/dports/lang/gcc41/files/patch-make-exports.pl-leopard

Modified: trunk/dports/lang/gcc41/Portfile
===================================================================
--- trunk/dports/lang/gcc41/Portfile	2008-01-19 15:17:55 UTC (rev 33154)
+++ trunk/dports/lang/gcc41/Portfile	2008-01-19 15:19:52 UTC (rev 33155)
@@ -4,7 +4,7 @@
 
 name			gcc41
 version			4.1.2
-revision		2
+revision		3
 platforms		darwin
 categories		lang
 maintainers		mww
@@ -32,6 +32,9 @@
 				${djava} sha1 e83838428b83a6aa76ee6d8b3db1cbd4fdc383bc \
 				${dobjc} sha1 ea97dab0f7096d267eba17d53a861d15b519868a
 
+# Handle Texinfo 4.1x.
+patchfiles		patch-configure-texinfo
+
 use_bzip2		yes
 
 depends_lib		port:gmp port:mpfr port:libiconv
@@ -46,7 +49,7 @@
 patch.dir       ${workpath}/gcc-${version}
 
 configure.cmd	../gcc-${version}/configure
-configure.args	--enable-languages=c \
+configure.args	--enable-languages=c,c++,objc,obj-c++,fortran,java \
 				--libdir=${prefix}/lib/${name} \
 				--includedir=${prefix}/include/${name} \
 				--infodir=${prefix}/share/info \
@@ -60,13 +63,12 @@
 				--with-gmp=${prefix} \
 				--with-mpfr=${prefix}
 
-#use_parallel_build	yes
-#build.target	profiledbootstrap
+use_parallel_build	yes
+build.target	profiledbootstrap
 
 post-destroot {
-	cd ${destroot}${prefix}
-	file delete -force share/man/man7
-	file delete -force share/info
+	file delete -force ${destroot}${prefix}/share/man/man7
+	file delete -force ${destroot}${prefix}/share/info
 	foreach b { c++ cpp fastjar g++ gcc gccbug gcj gcjh gcov gfortran gjnih grepjar } {
 		system "cd ${destroot}${prefix}/bin && ln -s ${b}-mp-4.1 ${b}-dp-4.1"
 	}
@@ -76,12 +78,15 @@
 	}
 }
 
-platform darwin 8 {
-	configure.compiler	gcc-4.0
+platform darwin 9 {
+	patchfiles-append	patch-make-exports.pl-leopard 
+	# Workaround for libiconv on Mac OS X 10.5 Leopard: force configure
+	# to look for the system's library, not the MacPort's one.
+	configure.args-append	--with-libiconv-prefix=/usr 
 }
 
 platform darwin i386 {
-	patchfiles		patch-darwin.h
+	patchfiles-append	patch-darwin.h
 }
 
 variant odcctools {

Added: trunk/dports/lang/gcc41/files/patch-configure-texinfo
===================================================================
--- trunk/dports/lang/gcc41/files/patch-configure-texinfo	                        (rev 0)
+++ trunk/dports/lang/gcc41/files/patch-configure-texinfo	2008-01-19 15:19:52 UTC (rev 33155)
@@ -0,0 +1,11 @@
+--- configure.orig	2006-11-21 18:48:36.000000000 +0100
++++ configure	2007-12-09 18:49:24.000000000 +0100
+@@ -3549,7 +3549,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.2 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.1[0-9]|[5-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"

Added: trunk/dports/lang/gcc41/files/patch-make-exports.pl-leopard
===================================================================
--- trunk/dports/lang/gcc41/files/patch-make-exports.pl-leopard	                        (rev 0)
+++ trunk/dports/lang/gcc41/files/patch-make-exports.pl-leopard	2008-01-19 15:19:52 UTC (rev 33155)
@@ -0,0 +1,11 @@
+--- libstdc++-v3/scripts/make_exports.pl.orig	2007-12-09 18:01:40.000000000 +0100
++++ libstdc++-v3/scripts/make_exports.pl	2007-12-09 18:02:17.000000000 +0100
+@@ -92,7 +92,7 @@
+ print STDERR $nm.' -P '.(join ' ', at ARGV).'|';
+ open NM,$nm.' -P '.(join ' ', at ARGV).'|' or die $!;
+ # Talk to c++filt through a pair of file descriptors.
+-open2(*FILTIN, *FILTOUT, "c++filt --strip-underscores") or die $!;
++open2(*FILTIN, *FILTOUT, "c++filt --strip-underscore") or die $!;
+ NAME: while (<NM>) {
+     my $i;
+     chomp;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080119/2e24c66d/attachment.html


More information about the macports-changes mailing list