From: Carsten Schlote <[email protected]> Added fix for version check to work with 2.20 (or higher) version correctly. Gentoo Patch. Crosstool-NG Patch. See URLs.
Signed-off-by: Carsten Schlote <[email protected]> --- .../generic/glibc-configure-bintuil-2.20.patch | 60 ++++++++++++++++++++ patches/glibc-2.9/generic/series | 1 + 2 files changed, 61 insertions(+), 0 deletions(-) create mode 100644 patches/glibc-2.9/generic/glibc-configure-bintuil-2.20.patch diff --git a/patches/glibc-2.9/generic/glibc-configure-bintuil-2.20.patch b/patches/glibc-2.9/generic/glibc-configure-bintuil-2.20.patch new file mode 100644 index 0000000..da49d96 --- /dev/null +++ b/patches/glibc-2.9/generic/glibc-configure-bintuil-2.20.patch @@ -0,0 +1,60 @@ +See http://bugs.gentoo.org/284393 +See http://old.nabble.com/-crosstool-ng---patch--glibc-2.9-patch-for-%22undefined-reference-to-%09%60_begin%27-td22751673.html +--- + configure | 4 ++-- + configure.in | 4 ++-- + elf/Makefile | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +Index: glibc-2.9/configure +=================================================================== +--- glibc-2.9.orig/configure 2009-11-19 14:22:48.000000000 +0100 ++++ glibc-2.9/configure 2009-11-19 14:26:10.000000000 +0100 +@@ -4531,7 +4531,7 @@ + ac_prog_version=`$AS -v </dev/null 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;; + +@@ -4594,7 +4594,7 @@ + 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;; + +Index: glibc-2.9/configure.in +=================================================================== +--- glibc-2.9.orig/configure.in 2009-11-19 14:22:48.000000000 +0100 ++++ glibc-2.9/configure.in 2009-11-19 14:25:18.000000000 +0100 +@@ -844,10 +844,10 @@ + # 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 +Index: glibc-2.9/elf/Makefile +=================================================================== +--- glibc-2.9.orig/elf/Makefile 2009-11-19 14:39:53.000000000 +0100 ++++ glibc-2.9/elf/Makefile 2009-11-19 14:40:52.000000000 +0100 +@@ -311,7 +311,7 @@ + $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ + LC_ALL=C \ + sed -e '/^=========/,/^=========/!d;/^=========/d' \ +- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ ++ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ + > [email protected] + $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ + $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ diff --git a/patches/glibc-2.9/generic/series b/patches/glibc-2.9/generic/series index bd319d5..5d0280b 100644 --- a/patches/glibc-2.9/generic/series +++ b/patches/glibc-2.9/generic/series @@ -28,3 +28,4 @@ gentoo/6400_all_sh-glibc-2.3.2-fpscr_values.patch gentoo/6415_all_sh-glibc-2.5-no-asm-user-header.patch gentoo/6416_all_sh-glibc-2.5-no-asm-elf-header.patch gentoo/6645_all_glibc-mips_shn_undef-hack.patch +glibc-configure-bintuil-2.20.patch -- 1.6.6.1 -- ptxdist mailing list [email protected]
