From ed8d41be39558829e2f08ed7736c25254f8eb019 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 18 Oct 2009 12:21:03 +0200 Subject: [PATCH] glibc: add patch to build with binutils-2.20. Reported by ojab at https://bugs.launchpad.net/xbps/+bug/453754 --HG-- extra : convert_revision : d94483b830fb82368f9c5e1bee92b33829ff7cf9 --- .../patches/glibc-2.10.1-binutils-2.20.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 templates/glibc/patches/glibc-2.10.1-binutils-2.20.patch diff --git a/templates/glibc/patches/glibc-2.10.1-binutils-2.20.patch b/templates/glibc/patches/glibc-2.10.1-binutils-2.20.patch new file mode 100644 index 00000000000..e33c1b2ba17 --- /dev/null +++ b/templates/glibc/patches/glibc-2.10.1-binutils-2.20.patch @@ -0,0 +1,50 @@ +From 4c14c8c348ee3e9a5fea3608cabcabdb275b6141 Mon Sep 17 00:00:00 2001 +From: H.J. Lu +Date: Sat, 5 Sep 2009 07:06:19 -0700 +Subject: [PATCH 1/1] Support binutils 2.20. + +--- + configure | 4 ++-- + configure.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- configure ++++ configure +@@ -4839,7 +4839,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;; + +@@ -4902,7 +4902,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 +--- configure.in ++++ 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 +-- +1.6.4 +