summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-11-09 12:14:28 +0000
committerJoshua Lock <josh@linux.intel.com>2010-12-10 16:50:39 +0000
commit72ddd5c20246a5d5b1752b58a61ef75b4c39cc40 (patch)
tree0300188a9303fa0e8b07afe866b9ec8ad4120c43
parent6026999e81042a7f6560f9bce04390865509b235 (diff)
downloadpoky-72ddd5c20246a5d5b1752b58a61ef75b4c39cc40.tar.gz
eglibc: fix build of eglibc-initial for make 3.82
Make 3.82, as shipped with Fedora 14, fixes some holes in the parser which in turn breaks behaviour of some Makefiles. Most notably eglibc's. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff25
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb5
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff b/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff
new file mode 100644
index 0000000000..934d31ab89
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff
@@ -0,0 +1,25 @@
1Make 3.82, as shipped with Fedora 14, fixes some holes in the parser which in
2turn breaks behaviour of some Makefiles. Most notably eglibc's.
3
4http://www.mail-archive.com/bug-make@gnu.org/msg06220.html
5
6Fix back-ported from glibc/eglibc revision control.
7
8JL 13/10/10
9
10Index: libc/manual/Makefile
11===================================================================
12--- libc.orig/manual/Makefile
13+++ libc/manual/Makefile
14@@ -243,7 +243,10 @@ ifdef objpfx
15 .PHONY: stubs
16 stubs: $(objpfx)stubs
17 endif
18-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
19+$(objpfx)stubs ../po/manual.pot:
20+ $(make-target-directory)
21+ touch $@
22+$(objpfx)stamp%:
23 $(make-target-directory)
24 touch $@
25
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 752c1d8cee..9db1436ae6 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -2,7 +2,7 @@ require eglibc.inc
2 2
3DEPENDS += "gperf-native" 3DEPENDS += "gperf-native"
4FILESPATHPKG =. "eglibc-svn:" 4FILESPATHPKG =. "eglibc-svn:"
5PR = "r9" 5PR = "r10"
6 6
7EGLIBC_BRANCH="eglibc-2_12" 7EGLIBC_BRANCH="eglibc-2_12"
8SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \ 8SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
@@ -11,7 +11,8 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
11 file://shorten-build-commands.patch \ 11 file://shorten-build-commands.patch \
12 file://mips-rld-map-check.patch \ 12 file://mips-rld-map-check.patch \
13 file://etc/ld.so.conf \ 13 file://etc/ld.so.conf \
14 file://generate-supported.mk" 14 file://generate-supported.mk \
15 file://fix-for-make-3.82.diff"
15SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch" 16SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch"
16S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" 17S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
17B = "${WORKDIR}/build-${TARGET_SYS}" 18B = "${WORKDIR}/build-${TARGET_SYS}"