From patchwork Thu Sep 6 08:29:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: perl: Remove the changes of bin, lib etc. as the defaults will give sane values. Date: Thu, 06 Sep 2012 08:29:24 -0000 From: Martin Ertsaas X-Patchwork-Id: 36025 Message-Id: <1346920164-29192-1-git-send-email-mertsas@cisco.com> To: openembedded-core@lists.openembedded.org 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,@DESTDIR@,${prefix},g' \ - -e 's,@ARCH@-thread-multi,,g' \ - -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ - -e 's,@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,@DESTDIR@,${prefix},g' \ + -e 's,@ARCH@-thread-multi,,g' \ + -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ + -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \ + -e "s%/perl5%/perl%g" \ + config.sh-${TARGET_ARCH}-${TARGET_OS} case "${TARGET_ARCH}" in x86_64 | powerpc | s390)