patches/gcc/4.4.2/130-cross-compile.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 1544 2228ea3f6b79
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
yann@1393
     1
diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
yann@1393
     2
--- gcc-4.4.0.orig/gcc/configure	2009-03-24 18:46:03.000000000 +0100
yann@1393
     3
+++ gcc-4.4.0/gcc/configure	2009-05-27 21:38:06.000000000 +0200
yann@1393
     4
@@ -13997,7 +13997,7 @@
yann@1393
     5
 	    | powerpc*-*-*,powerpc64*-*-*)
yann@1393
     6
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
yann@1393
     7
 	esac
yann@1393
     8
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
yann@1393
     9
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
yann@1393
    10
         SYSTEM_HEADER_DIR=$build_system_header_dir
yann@1393
    11
 fi
yann@1393
    12
 
yann@1393
    13
diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
yann@1393
    14
--- gcc-4.4.0.orig/gcc/configure.ac	2009-03-24 18:46:03.000000000 +0100
yann@1393
    15
+++ gcc-4.4.0/gcc/configure.ac	2009-05-27 21:38:06.000000000 +0200
yann@1393
    16
@@ -1720,7 +1720,7 @@
yann@1393
    17
 	    | powerpc*-*-*,powerpc64*-*-*)
yann@1393
    18
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
yann@1393
    19
 	esac
yann@1393
    20
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
yann@1393
    21
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
yann@1393
    22
         SYSTEM_HEADER_DIR=$build_system_header_dir 
yann@1393
    23
 fi
yann@1393
    24
 
yann@1393
    25
diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c
yann@1393
    26
--- gcc-4.4.0.orig/gcc/unwind-dw2.c	2009-04-10 01:23:07.000000000 +0200
yann@1393
    27
+++ gcc-4.4.0/gcc/unwind-dw2.c	2009-05-27 21:38:06.000000000 +0200
yann@1393
    28
@@ -329,9 +329,11 @@
yann@1393
    29
 }
yann@1393
    30
 #endif
yann@1393
    31
 
yann@1393
    32
+#ifndef inhibit_libc
yann@1393
    33
 #ifdef MD_UNWIND_SUPPORT
yann@1393
    34
 #include MD_UNWIND_SUPPORT
yann@1393
    35
 #endif
yann@1393
    36
+#endif
yann@1393
    37
 
yann@1393
    38
 /* Extract any interesting information from the CIE for the translation
yann@1393
    39
    unit F belongs to.  Return a pointer to the byte after the augmentation,