summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-13 22:38:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-13 22:41:06 +0100
commit160ee52b9563dac64941b5f6e2e072171ad396b8 (patch)
tree21c68b72678d89fd211cad368a8e388c8dc30e46
parent17f3cc1be0e8648cb4579793a9eb5a701deac85f (diff)
downloadopenembedded-core-160ee52b9563dac64941b5f6e2e072171ad396b8.tar.gz
openembedded-core-160ee52b9563dac64941b5f6e2e072171ad396b8.tar.bz2
openembedded-core-160ee52b9563dac64941b5f6e2e072171ad396b8.tar.xz
openembedded-core-160ee52b9563dac64941b5f6e2e072171ad396b8.zip
Revert "eglibc: fix perl path in target scripts on fedora 17 alpha"
This reverts commit 7c95d554c431451f975e1e5d0336d1fb7d0ce7ae. eglibc uses the PERL to execute things as well as encoding the path in target scripts. We will therefore have to resort to sed on the scripts at do_install time to fix the problems originally reported. This patch causes various weird build failures and needs to be removed. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb2
3 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 66934477b..8e3fe503b 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -54,5 +54,3 @@ do_configure_prepend() {
GLIBC_ADDONS ?= "ports,nptl,libidn"
SDK_GLIBC_ADDONS ?= "ports,nptl,libidn"
GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}"
-
-CACHED_CONFIGUREVARS = "ac_cv_path_PERL=${bindir}/perl"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index c1b684493..ec062610b 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "15508"
DEPENDS += "gperf-native"
-PR = "r24"
+PR = "r25"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index d52fe2de5..caed9e946 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "17386"
DEPENDS += "gperf-native"
-PR = "r4"
+PR = "r5"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_15"