summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2015-10-08 16:22:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-29 07:31:17 +0000
commit884cf7a3891abbe75bf63cc669b7b2082f7ffe39 (patch)
treee1235351e3411126287b62059d49c279e6a9cccd /meta/recipes-devtools/perl
parent2d0c4999a7dfb1c737f042af6b44b10c24483ff6 (diff)
downloadpoky-884cf7a3891abbe75bf63cc669b7b2082f7ffe39.tar.gz
perl: Correct path for vendorlib, vendorarch, sitelib and sitearch
This patch corrects the path specifications when building perl for vendorlib, vendorarch, sitelib and sitearch to allow newer dual-life module being installed on host to satisfy configure and build requirements of some CPAN distributions. Additionally, fix search path order in perl wrappers. (From OE-Core rev: ca5d96b1cf406897728f6f6bae6e0ab4e35a469a) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
-rw-r--r--meta/recipes-devtools/perl/perl-native_5.22.0.bb16
-rw-r--r--meta/recipes-devtools/perl/perl_5.22.0.bb2
2 files changed, 10 insertions, 8 deletions
diff --git a/meta/recipes-devtools/perl/perl-native_5.22.0.bb b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
index a9a1cab942..b4dda31285 100644
--- a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
@@ -28,16 +28,15 @@ do_configure () {
28 -Dcf_by="Open Embedded" \ 28 -Dcf_by="Open Embedded" \
29 -Dprefix=${prefix} \ 29 -Dprefix=${prefix} \
30 -Dvendorprefix=${prefix} \ 30 -Dvendorprefix=${prefix} \
31 -Dvendorprefix=${prefix} \
32 -Dsiteprefix=${prefix} \ 31 -Dsiteprefix=${prefix} \
33 \ 32 \
34 -Dbin=${STAGING_BINDIR}/${PN} \ 33 -Dbin=${STAGING_BINDIR}/${PN} \
35 -Dprivlib=${STAGING_LIBDIR}/perl/${PV} \ 34 -Dprivlib=${STAGING_LIBDIR}/perl/${PV} \
36 -Darchlib=${STAGING_LIBDIR}/perl/${PV} \ 35 -Darchlib=${STAGING_LIBDIR}/perl/${PV} \
37 -Dvendorlib=${STAGING_LIBDIR}/perl/${PV} \ 36 -Dvendorlib=${STAGING_LIBDIR}/perl/vendor_perl/${PV} \
38 -Dvendorarch=${STAGING_LIBDIR}/perl/${PV} \ 37 -Dvendorarch=${STAGING_LIBDIR}/perl/vendor_perl/${PV} \
39 -Dsitelib=${STAGING_LIBDIR}/perl/${PV} \ 38 -Dsitelib=${STAGING_LIBDIR}/perl/site_perl/${PV} \
40 -Dsitearch=${STAGING_LIBDIR}/perl/${PV} \ 39 -Dsitearch=${STAGING_LIBDIR}/perl/site_perl/${PV} \
41 \ 40 \
42 -Duseshrplib \ 41 -Duseshrplib \
43 -Dusethreads \ 42 -Dusethreads \
@@ -95,8 +94,11 @@ do_install () {
95 install $i ${D}${libdir}/perl/${PV}/CORE 94 install $i ${D}${libdir}/perl/${PV}/CORE
96 done 95 done
97 96
98 create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl:${STAGING_LIBDIR}/perl/site_perl/${PV}:${STAGING_LIBDIR}/perl/vendor_perl/${PV}' 97 # Those wrappers mean that perl installed from sstate (which may change
99 create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl${STAGING_LIBDIR}/perl:${STAGING_LIBDIR}/perl/site_perl/${PV}:${STAGING_LIBDIR}/perl/vendor_perl/${PV}' 98 # path location) works and that in the nativesdk case, the SDK can be
99 # installed to a different location from the one it was built for.
100 create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/site_perl/${PV}:${STAGING_LIBDIR}/perl/vendor_perl/${PV}:${STAGING_LIBDIR}/perl/${PV}'
101 create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/site_perl/${PV}:${STAGING_LIBDIR}/perl/vendor_perl/${PV}:${STAGING_LIBDIR}/perl/${PV}'
100 102
101 # Use /usr/bin/env nativeperl for the perl script. 103 # Use /usr/bin/env nativeperl for the perl script.
102 for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do 104 for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do
diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb b/meta/recipes-devtools/perl/perl_5.22.0.bb
index 66e074d37b..9df8d043e3 100644
--- a/meta/recipes-devtools/perl/perl_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.0.bb
@@ -246,7 +246,7 @@ do_install() {
246 246
247do_install_append_class-nativesdk () { 247do_install_append_class-nativesdk () {
248 create_wrapper ${D}${bindir}/perl \ 248 create_wrapper ${D}${bindir}/perl \
249 PERL5LIB='$PERL5LIB:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/${PV}:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/site_perl/${PV}:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/vendor_perl/${PV}' 249 PERL5LIB='$PERL5LIB:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/site_perl/${PV}:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/vendor_perl/${PV}:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/${PV}'
250} 250}
251 251
252PACKAGE_PREPROCESS_FUNCS += "perl_package_preprocess" 252PACKAGE_PREPROCESS_FUNCS += "perl_package_preprocess"