- fix for make 3.82

Changed files:
    glibc-newmake.patch -> 1.1
    glibc.spec -> 1.879

diff --git a/glibc-newmake.patch b/glibc-newmake.patch
new file mode 100644 (file)
index 0000000..56b0675
--- /dev/null
+++ b/glibc-newmake.patch
@@ -0,0 +1,28 @@
+Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
+Date:                    2010-07-26
+Initial Package Version: 2.11.2
+Upstream Status:         Not submitted
+Origin:                  Denis Onischenko
+                         (http://www.mail-archive.com/help-make@gnu.org/msg08847.html)
+Description:             Fixes an incompatibility with Make-3.82.
+
+diff -Naur glibc-2.11.2.orig/manual/Makefile glibc-2.11.2/manual/Makefile
+--- glibc-2.11.2.orig/manual/Makefile  2010-05-19 20:38:20.000000000 +0000
++++ glibc-2.11.2/manual/Makefile       2010-07-26 06:51:27.049899308 +0000
+@@ -232,9 +232,13 @@
+ .PHONY: stubs
+ stubs: $(objpfx)stubs
+ endif
+-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
+-      $(make-target-directory)
+-      touch $@
++$(objpfx)stubs ../po/manual.pot:
++      $(make-target-directory)
++      touch $@
++
++$(objpfx)stamp%:
++      $(make-target-directory)
++      touch $@
+ 
+ # Make the target directory if it doesn't exist, using the `mkinstalldirs'
+ # script that does `mkdir -p' even if `mkdir' doesn't support that flag.

diff --git a/glibc.spec b/glibc.spec
index a4a01dc130f44f798fb275b3948ac8566b47b147..c32d95b3f82ebcd5e2b6e33346befbdc9bc34dad 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -76,6 +76,7 @@ Patch26:      %{name}-posix-sh.patch
 Patch27:       %{name}-i686.patch
 Patch29:       %{name}-arm-alignment-fix.patch
 Patch30:       %{name}-static-glro-init.patch
+Patch31:       %{name}-newmake.patch
 URL:           http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires: audit-libs-devel}
 BuildRequires: autoconf
@@ -922,6 +923,7 @@ mv %{name}-ports-%{ports_version} ports
 %patch27 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f