[OE-core] [PATCH] perl: Remove the changes of bin, lib etc. as the defaults will give sane values.

Martin Ertsaas mertsas at cisco.com
Thu Sep 6 08:29:24 UTC 2012


The old config put stuff in ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-unknownsdk-linux/usr/local/oecore-x86_64/sysroots/x86_64-unknownsdk-linux/usr
instead of in ${perldir}/image/usr/local/oecore-x86_64/sysroot/x86_64-nimbussdk-linux/usr as it should.
---
 meta/recipes-devtools/perl/perl_5.14.2.bb |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 3c1360f..04e2597 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db grep-native"
 DEPENDS += "gdbm zlib"
-PR = "r9"
+PR = "r10"
 
 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl"
@@ -145,16 +145,13 @@ do_configure() {
 
 	${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
 
-        # Update some paths in the configuration
-        sed -i -e 's, at DESTDIR@,${prefix},g' \
-               -e 's, at ARCH@-thread-multi,,g' \
-               -e 's, at ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
-               -e 's, at STAGINGDIR@,${STAGING_DIR_HOST},g' \
-               -e "s%\([ \"^\',=]\+\)/usr/include%\1${STAGING_INCDIR}%g" \
-	       -e "s%\([ \"^\',=]\+\)/usr/lib/%\1${libdir}/%g" \
-	       -e "s%\([ \"^\',=]\+\)/usr/%\1${exec_prefix}/%g" \
-	       -e "s%/perl5%/perl%g" \
-            config.sh-${TARGET_ARCH}-${TARGET_OS}
+    # Update some paths in the configuration
+    sed -i -e 's, at DESTDIR@,${prefix},g' \
+           -e 's, at ARCH@-thread-multi,,g' \
+           -e 's, at ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
+           -e 's, at STAGINGDIR@,${STAGING_DIR_HOST},g' \
+           -e "s%/perl5%/perl%g" \
+          config.sh-${TARGET_ARCH}-${TARGET_OS}
 
 	case "${TARGET_ARCH}" in
 		x86_64 | powerpc | s390)
-- 
1.7.8.6





More information about the Openembedded-core mailing list