From 7c62cff6e9799b3570a92f419ab7f4ddc75e47117c39c49060c616dbcacc7007 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Mon, 13 Sep 2010 15:01:17 +0000 Subject: [PATCH] Accepting request 48018 from home:a_jaeger:branches:openSUSE:Factory reviewed ok. OBS-URL: https://build.opensuse.org/request/show/48018 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=40 --- glibc-make-3.82.patch | 30 ++++++++++++++++++++---------- glibc.changes | 8 +++++++- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/glibc-make-3.82.patch b/glibc-make-3.82.patch index f8608ae..702c044 100644 --- a/glibc-make-3.82.patch +++ b/glibc-make-3.82.patch @@ -14,10 +14,10 @@ Andreas. (sysd-rules-targets): Remove duplicates. * elf/rtld-Rules ($(objpfx)rtld-%.os): Add pattern rules with rtld-%.$o dependency. ---- - Makeconfig | 6 +++--- - elf/rtld-Rules | 9 +++++++++ - 2 files changed, 12 insertions(+), 3 deletions(-) + +2010-09-06 Andreas Schwab + + * manual/Makefile: Don't mix pattern rules with normal rules. diff --git a/Makeconfig b/Makeconfig index 9778998..807c1d1 100644 @@ -73,9 +73,19 @@ index 9f31a56..fc225f2 100644 -- 1.7.2.2 - --- -Andreas Schwab, schwab@redhat.com -GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E -"And now for something completely different." - +diff --git a/manual/Makefile b/manual/Makefile +index c5866eb..b1f5fa7 100644 +--- a/manual/Makefile ++++ b/manual/Makefile +@@ -232,7 +232,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 $@ + diff --git a/glibc.changes b/glibc.changes index e9ac4ce..d22b858 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 13 14:36:26 UTC 2010 - aj@suse.de + +- Fix build in manual with make 3.82. + ------------------------------------------------------------------- Sun Sep 12 08:00:57 UTC 2010 - aj@suse.de -- Work around shortest-stem feature in make 3.82+ +- Work around shortest-stem feature in make 3.82+ (patch + glibc-make-3.82.patch) ------------------------------------------------------------------- Wed Jul 7 04:12:05 CEST 2010 - pbaudis@suse.cz