Ticket #31948: patch-isysroot.diff

Portfile

@@ -65 +65 @@
 # 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 +75 @@
         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':

new file files/incpath.patch

@@ +1 @@
+--- 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);

files/other_langs.patch

@@ -1 +1 @@
 --- 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 \

files/suffix.patch

@@ -1 +1 @@
 --- 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 +12 @@
    --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