aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2010-11-05 12:25:32 +0000
committerKhem Raj <raj.khem@gmail.com>2010-11-06 08:47:36 -0700
commitfbcef382720a8130ebf15afc8f36b834e40e4405 (patch)
treec424e8d49569c0570b6168e4897fcbb57e675f85
parent363f6f64459ff483191c1d4bbba7963316e5578c (diff)
downloadopenembedded-fbcef382720a8130ebf15afc8f36b834e40e4405.tar.gz
openembedded-fbcef382720a8130ebf15afc8f36b834e40e4405.tar.bz2
openembedded-fbcef382720a8130ebf15afc8f36b834e40e4405.zip
eglibc: fix build issue with make-3.82
Add patch to fix this error when building eglibc-2.11, eglibc-2.12 with make-3.82: make[2]: Entering directory `eglibc-2_12/libc/manual' Makefile:246: *** mixed implicit and normal rules. Stop. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/eglibc/eglibc_2.11.bb3
-rw-r--r--recipes/eglibc/eglibc_2.12.bb3
-rw-r--r--recipes/eglibc/files/eglibc-make-382.patch15
3 files changed, 19 insertions, 2 deletions
diff --git a/recipes/eglibc/eglibc_2.11.bb b/recipes/eglibc/eglibc_2.11.bb
index 3763124a70..89742b6bef 100644
--- a/recipes/eglibc/eglibc_2.11.bb
+++ b/recipes/eglibc/eglibc_2.11.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"
PV = "2.11"
-PR = "${INC_PR}.7"
+PR = "${INC_PR}.8"
PR_append = "+svnr${SRCPV}"
SRCREV="10690"
EGLIBC_BRANCH="eglibc-2_11"
@@ -14,6 +14,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
file://shorten-build-commands.patch \
file://sh4_set_fpscr.patch \
file://sh4_local-fpscr_values.patch \
+ file://eglibc-make-382.patch \
file://etc/ld.so.conf \
file://generate-supported.mk"
S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb
index 40ab65c4d2..956f64b3e9 100644
--- a/recipes/eglibc/eglibc_2.12.bb
+++ b/recipes/eglibc/eglibc_2.12.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"
PV = "2.12"
-PR = "${INC_PR}.6"
+PR = "${INC_PR}.7"
PR_append = "+svnr${SRCPV}"
SRCREV="11762"
EGLIBC_BRANCH="eglibc-2_12"
@@ -16,6 +16,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \
file://sh4_local-fpscr_values.patch \
file://eglibc-dont-cache-slibdir.patch \
file://armv4-eabi-compile-fix.patch \
+ file://eglibc-make-382.patch \
file://etc/ld.so.conf \
file://generate-supported.mk"
S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/files/eglibc-make-382.patch b/recipes/eglibc/files/eglibc-make-382.patch
new file mode 100644
index 0000000000..5ecad90261
--- /dev/null
+++ b/recipes/eglibc/files/eglibc-make-382.patch
@@ -0,0 +1,15 @@
+http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=blob_plain;f=source/base/glibc/make-3.82-fix.patch;hb=8217c32ecc2e14962847ba3d8a272eb64a3dba4f
+
+--- libc/manual/Makefile
++++ libc/manual/Makefile
+@@ -232,7 +232,9 @@
+ .PHONY: stubs
+ stubs: $(objpfx)stubs
+ endif
+-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
++$(objpfx)stubs ../po/manual.pot:
++ touch $@
++$(objpfx)stamp%:
+ $(make-target-directory)
+ touch $@
+