Ticket #31948: patch-isysroot.diff

File patch-isysroot.diff, 2.7 KB (added by royliu@…, 13 years ago)

The cumulative patch for the port itself.

  • Portfile

    old new  
    6565# other_langs.patch        : Add support for gcj and gfortran to build_gcc
    6666# makeinfo.patch           : Fix version detection for makeinfo in configure scripts
    6767# werror-*.patch           : Fix compilation errors when building for x86_64
     68# incpath.patch            : Don't prepend the -isysroot option argument to the compiler's own search paths
    6869patchfiles \
    6970        system-libstdc++.patch \
    7071        no-rm-system.patch \
     
    7475        stage1-cc.patch \
    7576        other_langs.patch \
    7677        werror-c-incpath.patch \
    77         werror-local-alloc.patch
     78        werror-local-alloc.patch \
     79        incpath.patch
    7880
    7981# gcj fails to build:
    8082# 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
     2+++ gcc/c-incpath.c     2011-11-06 23:49:39.000000000 -0500
     3@@ -164,10 +164,7 @@
     4          char *str;
     5 
     6          /* Should this directory start with the sysroot?  */
     7-         if (sysroot && p->add_sysroot)
     8-           str = concat (sysroot, p->fname, NULL);
     9-         else
     10-           str = update_path (p->fname, p->component);
     11+         str = update_path (p->fname, p->component);
     12 
     13          if (p->multilib && imultilib)
     14            str = concat (str, dir_separator_str, imultilib, NULL);
  • files/other_langs.patch

    old new  
    11--- build_gcc.orig      2011-07-08 00:24:49.000000000 -0700
    22+++ build_gcc   2011-07-08 00:31:49.000000000 -0700
    33@@ -178,9 +178,14 @@ CONFIGFLAGS="--disable-checking  \
    4    --libdir=\${prefix}/lib/apple-gcc42 \
    5    --includedir=\${prefix}/include/apple-gcc42 \
     4   --libdir=$DEST_ROOT/lib/apple-gcc42 \
     5   --includedir=$DEST_ROOT/include/apple-gcc42 \
    66   --program-suffix=-apple-$MAJ_VERS \
    77+  --with-system-zlib \
    88+  --disable-nls \
  • files/suffix.patch

    old new  
    11--- build_gcc.orig      2011-07-12 22:44:19.000000000 -0700
    22+++ build_gcc   2011-07-12 22:45:31.000000000 -0700
    3 @@ -174,7 +174,10 @@ CONFIGFLAGS="--disable-checking --enable
     3@@ -177,7 +177,10 @@ CONFIGFLAGS="--disable-checking --enable
    44   --prefix=$DEST_ROOT \
    55   --mandir=\${prefix}/share/man \
    66   --enable-languages=$LANGUAGES \
     
    1212   --with-slibdir=/usr/lib \
    1313   --build=$BUILD-apple-darwin$DARWIN_VERS"
    1414 
    15 @@ -227,7 +230,7 @@ make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-
     15@@ -230,7 +233,7 @@ make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-
    1616 
    1717 # Add the compiler we just built to the path, giving it appropriate names.
    1818 D=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin