Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.9/600-recent-binutils.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 1654 489e9f2158fa
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@1967 
     1
 
diff -durN glibc-2.9.orig/configure glibc-2.9/configure
yann@1967 
     2
 
--- glibc-2.9.orig/configure	2010-05-18 23:47:23.000000000 +0200
yann@1967 
     3
 
+++ glibc-2.9/configure	2010-05-18 23:50:04.000000000 +0200
yann@1967 
     4
 
@@ -4534,7 +4534,7 @@
fr@1654 
     5
 
   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
fr@1654 
     6
 
   case $ac_prog_version in
fr@1654 
     7
 
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
fr@1654 
     8
 
-    2.1[3-9]*)
yann@1967 
     9
 
+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
fr@1654 
    10
 
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
fr@1654 
    11
 
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
fr@1654 
    12
yann@1967 
    13
 
@@ -4597,7 +4597,7 @@
fr@1654 
    14
 
   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
fr@1654 
    15
 
   case $ac_prog_version in
fr@1654 
    16
 
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
fr@1654 
    17
 
-    2.1[3-9]*)
yann@1967 
    18
 
+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
fr@1654 
    19
 
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
fr@1654 
    20
 
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
fr@1654 
    21
yann@1967 
    22
 
diff -durN glibc-2.9.orig/configure.in glibc-2.9/configure.in
yann@1967 
    23
 
--- glibc-2.9.orig/configure.in	2010-05-18 23:47:23.000000000 +0200
yann@1967 
    24
 
+++ glibc-2.9/configure.in	2010-05-18 23:51:25.000000000 +0200
fr@1654 
    25
 
@@ -844,10 +844,10 @@
fr@1654 
    26
 
 # Accept binutils 2.13 or newer.
fr@1654 
    27
 
 AC_CHECK_PROG_VER(AS, $AS, --version,
fr@1654 
    28
 
 		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
fr@1654 
    29
 
-		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
yann@1967 
    30
 
+		  [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as")
fr@1654 
    31
 
 AC_CHECK_PROG_VER(LD, $LD, --version,
fr@1654 
    32
 
 		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
fr@1654 
    33
 
-		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
yann@1967 
    34
 
+		  [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld")
fr@1654 
    35
fr@1654 
    36
 
 # We need the physical current working directory.  We cannot use the
fr@1654 
    37
 
 # "pwd -P" shell builtin since that's not portable.  Instead we try to
crosstool-ng