[packages/glibc/AC-branch] accept newer binutils

glen glen at pld-linux.org
Tue Jan 27 21:59:22 CET 2015


commit e082b3a00198eef135210b3a63997c03e7689628
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jan 27 22:58:49 2015 +0200

    accept newer binutils

 binutils-2.20.patch | 15 +++++++++++++++
 glibc.spec          |  2 ++
 2 files changed, 17 insertions(+)
---
diff --git a/glibc.spec b/glibc.spec
index 30526a2..b6c4c2b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -151,6 +151,7 @@ Patch42:	%{name}-rh228103.patch
 Patch43:	%{name}-rh219145.patch
 Patch44:	%{name}-posix-sh.patch
 Patch45:	%{name}-bug-2644.patch
+Patch46:	binutils-2.20.patch
 URL:		http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
@@ -1010,6 +1011,7 @@ Biblioteki 64-bitowe GNU libc dla architektury 64bit.
 %patch43 -p1
 %patch44 -p1
 %patch45 -p0
+%patch46 -p1
 
 chmod +x scripts/cpp
 
diff --git a/binutils-2.20.patch b/binutils-2.20.patch
new file mode 100644
index 0000000..12370fe
--- /dev/null
+++ b/binutils-2.20.patch
@@ -0,0 +1,15 @@
+--- glibc-2.3.6/configure.in~	2005-07-18 04:38:55.000000000 +0300
++++ glibc-2.3.6/configure.in	2015-01-27 22:42:00.707580267 +0200
+@@ -734,10 +734,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.[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.[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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/e082b3a00198eef135210b3a63997c03e7689628



More information about the pld-cvs-commit mailing list