From 784f93baf3fe1ea77026edafc890fb7dc2e83794 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 9 Oct 2012 19:48:24 -0500 Subject: perl: add archlib_exp variable used to generate ARCHLIB_EXP in config.h perl.c uses an ARCHLIB_EXP define to generate compile-time code that adds the archlibexp path to @INC during run-time initialization of a new perl interpreter. Because we've changed this value in a temporary way to make it possible to use ExtUtils::Embed in the target build (the temporary value in config.sh gets re-stripped out during packaging), the ARCHLIB_EXP value that gets generated still uses the temporary version instead of the original expected version (i.e. becauses it's in the generated config.h, it doesn't get stripped out during packaging like the others in config.sh). This creates an unmodified version called archlib_exp that gets used by a modified config_h.SH to get the correct value into config.h This patch uses an unmodified version of archlibexp called archlib_exp, introduced to config.sh, which is used to generate the correct value of ARCHLIB_EXP into config.h Fixes [YOCTO #3099]. (From OE-Core rev: cbcfdeb1d55e2e76f199750bda401bad126ae234) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl_5.14.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/perl/perl_5.14.2.bb') diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index 09b2acb191..d9206d86d3 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 = "r10" +PR = "r11" # 5.10.1 has Module::Build built-in PROVIDES += "libmodule-build-perl" @@ -66,6 +66,7 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \ file://cross-generate_uudmap.patch \ file://fix_bad_rpath.patch \ file://perl-build-in-t-dir.patch \ + file://perl-archlib-exp.patch \ \ file://config.sh \ file://config.sh-32 \ -- cgit v1.2.3-54-g00ecf