2b580b9846
- I still have not understood why it worked without this fix before, and I think this has been triggered by the gcc-4.4, but I have not investigated this much. I went with the trivial fix. Adding a glibc-2.10.1 expression, because the glibc-2.11 still does not have a ports release, so it cannot be used in arm. I'm using it only in native compilation by now. Making the default glibc to be 2.10 instead of 2.11 in armv5tel-linux. svn path=/nixpkgs/branches/stdenv-updates/; revision=18688
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
Support GNU Binutils 2.20 and beyond. Patch from
|
|
http://sourceware.org/ml/libc-alpha/2009-09/msg00009.html .
|
|
|
|
diff --git a/configure b/configure
|
|
index 48e6952..b1d84d7 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -4841,7 +4841,7 @@ $as_echo_n "checking version of $AS... " >&6; }
|
|
ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
|
|
case $ac_prog_version in
|
|
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
- 2.1[3-9]*)
|
|
+ 2.1[3-9]*|[2-9].[2-9]*)
|
|
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
|
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
|
|
|
@@ -4904,7 +4904,7 @@ $as_echo_n "checking version of $LD... " >&6; }
|
|
ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
|
|
case $ac_prog_version in
|
|
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
- 2.1[3-9]*)
|
|
+ 2.1[3-9]*|[2-9].[2-9]*)
|
|
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
|
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index 4584afe..7c4f71f 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -897,10 +897,10 @@ AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in
|
|
# Accept binutils 2.13 or newer.
|
|
AC_CHECK_PROG_VER(AS, $AS, --version,
|
|
[GNU assembler.* \([0-9]*\.[0-9.]*\)],
|
|
- [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
|
|
+ [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")
|
|
AC_CHECK_PROG_VER(LD, $LD, --version,
|
|
[GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
|
|
- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
|
|
+ [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")
|
|
|
|
# We need the physical current working directory. We cannot use the
|
|
# "pwd -P" shell builtin since that's not portable. Instead we try to
|