[87123] trunk/dports/lang/apple-gcc42
royliu at macports.org
royliu at macports.org
Thu Nov 10 17:10:14 PST 2011
Revision: 87123
http://trac.macports.org/changeset/87123
Author: royliu at macports.org
Date: 2011-11-10 17:10:14 -0800 (Thu, 10 Nov 2011)
Log Message:
-----------
apple-gcc42: change the behavior of the isysroot option and close ticket #31948
Modified Paths:
--------------
trunk/dports/lang/apple-gcc42/Portfile
trunk/dports/lang/apple-gcc42/files/other_langs.patch
trunk/dports/lang/apple-gcc42/files/suffix.patch
Added Paths:
-----------
trunk/dports/lang/apple-gcc42/files/incpath.patch
Modified: trunk/dports/lang/apple-gcc42/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc42/Portfile 2011-11-11 00:14:53 UTC (rev 87122)
+++ trunk/dports/lang/apple-gcc42/Portfile 2011-11-11 01:10:14 UTC (rev 87123)
@@ -6,7 +6,7 @@
name apple-gcc42
version 5666.3
set gcc_version 4.2.1
-revision 1
+revision 2
categories lang
platforms darwin
maintainers jeremyhu openmaintainer
@@ -65,6 +65,7 @@
# other_langs.patch : Add support for gcj and gfortran to build_gcc
# makeinfo.patch : Fix version detection for makeinfo in configure scripts
# werror-*.patch : Fix compilation errors when building for x86_64
+# incpath.patch : Don't prepend the -isysroot option argument to the compiler's own search paths
patchfiles \
system-libstdc++.patch \
no-rm-system.patch \
@@ -74,7 +75,8 @@
stage1-cc.patch \
other_langs.patch \
werror-c-incpath.patch \
- werror-local-alloc.patch
+ werror-local-alloc.patch \
+ incpath.patch
# gcj fails to build:
# gcc/java/lang.c: In function 'java_init':
Added: trunk/dports/lang/apple-gcc42/files/incpath.patch
===================================================================
--- trunk/dports/lang/apple-gcc42/files/incpath.patch (rev 0)
+++ trunk/dports/lang/apple-gcc42/files/incpath.patch 2011-11-11 01:10:14 UTC (rev 87123)
@@ -0,0 +1,14 @@
+--- gcc/c-incpath.c.orig 2011-11-06 23:49:39.000000000 -0500
++++ gcc/c-incpath.c 2011-11-06 23:49:39.000000000 -0500
+@@ -164,10 +164,7 @@
+ char *str;
+
+ /* Should this directory start with the sysroot? */
+- if (sysroot && p->add_sysroot)
+- str = concat (sysroot, p->fname, NULL);
+- else
+- str = update_path (p->fname, p->component);
++ str = update_path (p->fname, p->component);
+
+ if (p->multilib && imultilib)
+ str = concat (str, dir_separator_str, imultilib, NULL);
Modified: trunk/dports/lang/apple-gcc42/files/other_langs.patch
===================================================================
--- trunk/dports/lang/apple-gcc42/files/other_langs.patch 2011-11-11 00:14:53 UTC (rev 87122)
+++ trunk/dports/lang/apple-gcc42/files/other_langs.patch 2011-11-11 01:10:14 UTC (rev 87123)
@@ -1,8 +1,8 @@
--- build_gcc.orig 2011-07-08 00:24:49.000000000 -0700
+++ build_gcc 2011-07-08 00:31:49.000000000 -0700
@@ -178,9 +178,14 @@ CONFIGFLAGS="--disable-checking \
- --libdir=\${prefix}/lib/apple-gcc42 \
- --includedir=\${prefix}/include/apple-gcc42 \
+ --libdir=$DEST_ROOT/lib/apple-gcc42 \
+ --includedir=$DEST_ROOT/include/apple-gcc42 \
--program-suffix=-apple-$MAJ_VERS \
+ --with-system-zlib \
+ --disable-nls \
Modified: trunk/dports/lang/apple-gcc42/files/suffix.patch
===================================================================
--- trunk/dports/lang/apple-gcc42/files/suffix.patch 2011-11-11 00:14:53 UTC (rev 87122)
+++ trunk/dports/lang/apple-gcc42/files/suffix.patch 2011-11-11 01:10:14 UTC (rev 87123)
@@ -1,6 +1,6 @@
--- build_gcc.orig 2011-07-12 22:44:19.000000000 -0700
+++ build_gcc 2011-07-12 22:45:31.000000000 -0700
-@@ -174,7 +174,10 @@ CONFIGFLAGS="--disable-checking --enable
+@@ -177,7 +177,10 @@ CONFIGFLAGS="--disable-checking --enable
--prefix=$DEST_ROOT \
--mandir=\${prefix}/share/man \
--enable-languages=$LANGUAGES \
@@ -12,7 +12,7 @@
--with-slibdir=/usr/lib \
--build=$BUILD-apple-darwin$DARWIN_VERS"
-@@ -227,7 +230,7 @@ make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-
+@@ -230,7 +233,7 @@ make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-
# Add the compiler we just built to the path, giving it appropriate names.
D=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111110/340b38ec/attachment.html>
More information about the macports-changes
mailing list