[22219] trunk/dports/lang/gcc42/Portfile

source_changes at macosforge.org source_changes at macosforge.org
Thu Feb 22 03:21:58 PST 2007


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

Log Message:
-----------
-fix problem with x64: disable multilibs explicitely on x86/64, too
-do not use odcctools due to problems with x64, make usage a variant

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

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

Modified: trunk/dports/lang/gcc42/Portfile
===================================================================
--- trunk/dports/lang/gcc42/Portfile	2007-02-22 08:39:01 UTC (rev 22218)
+++ trunk/dports/lang/gcc42/Portfile	2007-02-22 11:21:57 UTC (rev 22219)
@@ -4,6 +4,7 @@
 
 name			gcc42
 version			4.2-20070124
+revision		1
 platforms		darwin
 categories		lang
 maintainers		mww at macports.org
@@ -32,17 +33,12 @@
 
 use_bzip2		yes
 
-depends_lib		port:gmp port:mpfr port:libiconv port:odcctools
+depends_lib		port:gmp port:mpfr port:libiconv
 
 set major		4.2
 
 worksrcdir		build
 
-patch {
-	reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
-		${workpath}/gcc-${version}/gcc/config/darwin.h
-}
-
 pre-configure {
 	file mkdir ${worksrcpath}
 }
@@ -56,13 +52,11 @@
 				--with-local-prefix=${prefix} \
 				--with-system-zlib \
 				--disable-nls \
+				--disable-multilib \
 				--program-suffix=-dp-${major} \
 				--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
 				--with-gmp=${prefix} \
-				--with-mpfr=${prefix} \
-				--with-as=${prefix}/bin/odas \
-				--with-ld=${prefix}/bin/odld \
-				--with-ar=${prefix}/bin/odar
+				--with-mpfr=${prefix}
 
 build.target	bootstrap
 build.args		-j 2
@@ -82,11 +76,20 @@
 	configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
 }
 
-platform powerpc {
-	configure.args-append --disable-multilib
-	post-destroot {
-		system "cd ${destroot}${prefix}/include/${name} && \
-			cp ../../lib/${name}/gcc/*/4.2.0/include/ffitarget.h ."
+post-destroot {
+	system "cd ${destroot}${prefix}/include/${name} && \
+		cp ../../lib/${name}/gcc/*/4.2.0/include/ffitarget.h ."
+}
+
+# odcctools currently do not compile for x64 - move to variant for the time being
+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
 }
 

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


More information about the macports-changes mailing list