patches/binutils/2.20.1/160-amd64-32bit-path.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 1614 3f76cdbceb6e
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@2088
     1
yann@2088
     2
yann@2088
     3
diff -durN binutils-2.20.1.orig/ld/emulparams/elf_i386.sh binutils-2.20.1/ld/emulparams/elf_i386.sh
yann@2088
     4
--- binutils-2.20.1.orig/ld/emulparams/elf_i386.sh	2009-07-29 16:59:23.000000000 +0200
yann@2088
     5
+++ binutils-2.20.1/ld/emulparams/elf_i386.sh	2010-08-17 19:32:12.000000000 +0200
yann@1614
     6
@@ -13,3 +13,13 @@
yann@1614
     7
 NO_SMALL_DATA=yes
yann@1614
     8
 SEPARATE_GOTPLT=12
yann@1614
     9
 IREL_IN_PLT=
yann@1614
    10
+
yann@1614
    11
+# In Gentoo, we install 32bit libs into /lib32 in an
yann@1614
    12
+# ABI setup with amd64/x86
yann@1614
    13
+case "$target" in
yann@1614
    14
+  x86_64*-linux*)
yann@1614
    15
+    case "$EMULATION_NAME" in
yann@1614
    16
+      *i386*) LIBPATH_SUFFIX=32  ;;
yann@1614
    17
+    esac
yann@1614
    18
+  ;;
yann@1614
    19
+esac