aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/glibc
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2010-09-13 14:15:35 -0400
committerCliff Brake <cbrake@bec-systems.com>2010-09-13 14:15:35 -0400
commit4ee358534793381d2e87b01781079a3354fd5c1c (patch)
tree729f8b0ce4bdbcd8a16f561fb68da0d66c3a3eb8 /recipes/glibc
parentbeb17e26ee9b4bc0cf334c3b30560c6eb66b1299 (diff)
parenteda06ec3dde6169a46797f876a82499c4fff8f62 (diff)
downloadopenembedded-testing_2010-09-13.tar.gz
openembedded-testing_2010-09-13.tar.bz2
openembedded-testing_2010-09-13.zip
Merge branch 'org.openembedded.dev' into testing-nexttesting_2010-09-13
Diffstat (limited to 'recipes/glibc')
-rw-r--r--recipes/glibc/glibc-2.9/0001-Don-t-mix-pattern-rules-with-normal-rules.patch29
-rw-r--r--recipes/glibc/glibc_2.9.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/recipes/glibc/glibc-2.9/0001-Don-t-mix-pattern-rules-with-normal-rules.patch b/recipes/glibc/glibc-2.9/0001-Don-t-mix-pattern-rules-with-normal-rules.patch
new file mode 100644
index 0000000000..183800691c
--- /dev/null
+++ b/recipes/glibc/glibc-2.9/0001-Don-t-mix-pattern-rules-with-normal-rules.patch
@@ -0,0 +1,29 @@
+From 32cf40699346d37fabfa887bbd95e95004799ae1 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Mon, 6 Sep 2010 14:55:59 +0200
+Subject: [PATCH] Don't mix pattern rules with normal rules
+
+---
+ ChangeLog | 4 ++++
+ manual/Makefile | 5 ++++-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+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 $@
+
+--
+1.7.0.2
+
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index 33326f3781..1d7fad8a0f 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -63,6 +63,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2;name=archive \
file://glibc-2.9-use-_begin.patch \
file://arm-lowlevellock-include-tls.patch \
file://glibc-2.9-enable-binutils-2.2.patch \
+ file://0001-Don-t-mix-pattern-rules-with-normal-rules.patch \
"
# patches to fix libmemusage.so