summaryrefslogtreecommitdiffstats
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:44:45 +0100
commitbc5d68e30bdfab44b55f672443c86bb18df7e8ad (patch)
treef5f0dc3295a5b0198e0777744e43cba5fbf6561e
parent60a7403f6c780a8952a10c808ee726f8775d2b97 (diff)
downloadpoky-bc5d68e30bdfab44b55f672443c86bb18df7e8ad.tar.gz
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 <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 66934477b6..8e3fe503b8 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -54,5 +54,3 @@ do_configure_prepend() {
54GLIBC_ADDONS ?= "ports,nptl,libidn" 54GLIBC_ADDONS ?= "ports,nptl,libidn"
55SDK_GLIBC_ADDONS ?= "ports,nptl,libidn" 55SDK_GLIBC_ADDONS ?= "ports,nptl,libidn"
56GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}" 56GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}"
57
58CACHED_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
3SRCREV = "15508" 3SRCREV = "15508"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r24" 6PR = "r25"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_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
3SRCREV = "17386" 3SRCREV = "17386"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r4" 6PR = "r5"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_15" 9EGLIBC_BRANCH="eglibc-2_15"