From bc5d68e30bdfab44b55f672443c86bb18df7e8ad Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 13 Apr 2012 22:38:14 +0100 Subject: 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. (From OE-Core rev: 160ee52b9563dac64941b5f6e2e072171ad396b8) Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc.inc | 2 -- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 66934477b6..8e3fe503b8 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 c1b6844934..ec062610bd 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 d52fe2de5a..caed9e9464 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" -- cgit v1.2.3-54-g00ecf