[22220] trunk/dports/lang/gcc41

[source_changes at macosforge.org]

Revision: 22220
          http://trac.macosforge.org/projects/macports/changeset/22220
Author:   mww at macports.org
Date:     2007-02-22 03:31:14 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
-fix problem with x64 (see patch) 
-do not use odcctools due to problems with x64, make usage a variant
-increase revision

thanks to davidm at astro.berkeley.edu for the patch for x64!

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

Added Paths:
-----------
    trunk/dports/lang/gcc41/files/
    trunk/dports/lang/gcc41/files/patch-darwin.h

Modified: trunk/dports/lang/gcc41/Portfile
===================================================================
--- trunk/dports/lang/gcc41/Portfile	2007-02-22 11:21:57 UTC (rev 22219)
+++ trunk/dports/lang/gcc41/Portfile	2007-02-22 11:31:14 UTC (rev 22220)
@@ -4,6 +4,7 @@
 
 name			gcc41
 version			4.1.2
+revision		1
 platforms		darwin
 categories		lang
 maintainers		mww at macports.org
@@ -33,7 +34,7 @@
 
 use_bzip2		yes
 
-depends_lib		port:gmp port:mpfr port:libiconv port:odcctools
+depends_lib		port:gmp port:mpfr port:libiconv
 
 set major		4.1
 
@@ -51,6 +52,7 @@
 				--mandir=${prefix}/share/man \
 				--with-local-prefix=${prefix} \
 				--with-system-zlib \
+				--disable-multilib \
 				--disable-nls \
 				--program-suffix=-dp-${major} \
 				--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
@@ -65,26 +67,29 @@
 	file delete -force share/info
 }
 
-platform darwin {
-	depends_lib-append	port:odcctools
-	patch {
-		reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
-			${workpath}/gcc-${version}/gcc/config/darwin.h
-	}
-	configure.args-append	--with-as=${prefix}/bin/odas \
-		--with-ld=${prefix}/bin/odld \
-		--with-ar=${prefix}/bin/odar
-}
-
 platform darwin 8 {
 	configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
 }
 
+platform darwin i386 {
+	patchfiles		patch-darwin.h
+}
+
 platform powerpc {
-	configure.args-append --disable-multilib
 	post-destroot {
 		system "cd ${destroot}${prefix}/include/${name} && \
 			cp ../../lib/${name}/gcc/*/${version}/include/libffi/ffitarget.h ."
 	}
 }
 
+variant odcctools {
+	depends_lib-append	port:odcctools
+	patch {
+		reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
+			${workpath}/gcc-${version}/gcc/config/darwin.h
+	}
+	configure.args-append	--with-as=${prefix}/bin/odas \
+		--with-ld=${prefix}/bin/odld \
+		--with-ar=${prefix}/bin/odar
+}
+

Added: trunk/dports/lang/gcc41/files/patch-darwin.h
===================================================================
--- trunk/dports/lang/gcc41/files/patch-darwin.h	                        (rev 0)
+++ trunk/dports/lang/gcc41/files/patch-darwin.h	2007-02-22 11:31:14 UTC (rev 22220)
@@ -0,0 +1,11 @@
+--- gcc/config/i386/darwin.h.orig	2007-02-21 09:08:33.000000000 -0800
++++ gcc/config/i386/darwin.h	2007-02-21 09:10:03.000000000 -0800
+@@ -106,6 +106,8 @@
+ #define ASM_LONG "\t.long\t"
+ /* Darwin as doesn't do ".quad".  */
+ 
++#define SUBTARGET_ENCODE_SECTION_INFO  darwin_encode_section_info
++
+ #undef ASM_OUTPUT_ALIGN
+ #define ASM_OUTPUT_ALIGN(FILE,LOG)	\
+  do { if ((LOG) != 0)			\

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070222/0194cfa9/attachment.html