[arm-gp2x-linux-glibc/f14/master] - Fix building with latest make (#631444)

[Hans de Goede]

commit 9c7214d5cd2c0d7aa1295e867574d7a762ec98dc
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Sep 8 18:49:29 2010 +0200

    - Fix building with latest make (#631444)

 arm-gp2x-linux-glibc.spec         |   11 ++++++++++-
 glibc-2.3.6-manual-makefile.patch |   15 +++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/arm-gp2x-linux-glibc.spec b/arm-gp2x-linux-glibc.spec
index b98c932..e128f85 100644
--- a/arm-gp2x-linux-glibc.spec
+++ b/arm-gp2x-linux-glibc.spec
@@ -2,7 +2,7 @@
 
 Name:           %{target}-glibc
 Version:        2.3.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Cross Compiled GNU C Library targeted at %{target}
 Group:          Development/Languages
 License:        LGPLv2+
@@ -20,6 +20,7 @@ Patch7:         http://kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/gl
 Patch8:         http://kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/make-install-lib-all.patch
 # from: http://open2x.svn.sourceforge.net/viewvc/open2x/trunk/toolchain-new/patches/glibc-linuxthreads-2.3.6/glibc-linuxthreads-2.3.6-raise.patch?revision=223
 Patch9:         glibc-linuxthreads-2.3.6-raise.patch
+Patch10:        glibc-2.3.6-manual-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  %{target}-gcc %{target}-kernel-headers
 BuildArch:      noarch
@@ -44,6 +45,7 @@ tar -xf %{SOURCE1}
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 popd
 cp -a %{SOURCE2} .
 
@@ -73,6 +75,10 @@ popd
 rm -rf $RPM_BUILD_ROOT
 pushd build-%{target}-glibc
 make install-lib-all install_root=$RPM_BUILD_ROOT
+# For some reason with newer makes there are both .dt and .d files in math
+# after the build, this confuses make install-headers so remove the .dt ones
+# which should not be there
+rm math/*.dt
 make install-headers install_root=$RPM_BUILD_ROOT
 install -m 644 bits/stdio_lim.h $RPM_BUILD_ROOT%{_prefix}/%{target}/include/bits
 install -m 644 stubs.h $RPM_BUILD_ROOT%{_prefix}/%{target}/include/gnu
@@ -103,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  8 2010 Hans de Goede <hdegoede at redhat.com> 2.3.6-8
+- Fix building with latest make (#631444)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/glibc-2.3.6-manual-makefile.patch b/glibc-2.3.6-manual-makefile.patch
new file mode 100644
index 0000000..03abb5b
--- /dev/null
+++ b/glibc-2.3.6-manual-makefile.patch
@@ -0,0 +1,15 @@
+diff -up glibc-2.3.6/manual/Makefile~ glibc-2.3.6/manual/Makefile
+--- glibc-2.3.6/manual/Makefile~	2004-03-18 23:26:32.000000000 +0100
++++ glibc-2.3.6/manual/Makefile	2010-09-08 10:24:37.149691057 +0200
+@@ -233,7 +233,10 @@ ifdef objpfx
+ .PHONY: stubs
+ stubs: $(objpfx)stubs
+ endif
+-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
++$(objpfx)stubs ../po/manual.pot:
++	$(make-target-directory)
++	touch $@
++$(objpfx)stamp%:
+ 	$(make-target-directory)
+ 	touch $@
+