summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/perl/perl-ptest.inc32
-rw-r--r--meta/recipes-devtools/perl/perl/perl-test-customized.patch2
-rw-r--r--meta/recipes-devtools/perl/perl_5.24.1.bb1
3 files changed, 24 insertions, 11 deletions
diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc
index 1f549af1b3..6a7a2d7cb3 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/meta/recipes-devtools/perl/perl-ptest.inc
@@ -2,31 +2,43 @@ inherit ptest
2 2
3SRC_URI += "file://run-ptest \ 3SRC_URI += "file://run-ptest \
4 " 4 "
5
6do_install_ptest () { 5do_install_ptest () {
7 mkdir -p ${D}${PTEST_PATH} 6 mkdir -p ${D}${PTEST_PATH}
8 sed -e "s:\/usr\/local:${bindir}:g" -i cpan/version/t/* 7 sed -e "s:\/usr\/local:${bindir}:g" -i cpan/version/t/*
9 sed -e "s:\/opt:\/usr:" -i Porting/add-package.pl 8 sed -e "s:\/opt:\/usr:" -i Porting/add-package.pl
10 sed -e "s:\/local\/gnu\/:\/:" -i hints/cxux.sh 9 sed -e "s:\/local\/gnu\/:\/:" -i hints/cxux.sh
11 tar -c --exclude=\*.o --exclude=libperl.so --exclude=Makefile --exclude=makefile --exclude=hostperl \ 10 tar -c --exclude='*.o' --exclude=libperl.so --exclude=Makefile --exclude=makefile --exclude=hostperl \
11 --exclude=cygwin --exclude=os2 --exclude=djgpp --exclude=qnx --exclude=symbian --exclude=haiku \
12 --exclude=vms --exclude=vos --exclude=NetWare --exclude=amigaos4 --exclude=buildcustomize.pl \
13 --exclude='win32/config.*' --exclude=plan9 --exclude=README.plan9 --exclude=perlplan9.pod --exclude=Configure \
14 --exclude=veryclean.sh --exclude=realclean.sh --exclude=getioctlsizes \
15 --exclude=dl_aix.xs --exclude=sdbm.3 --exclude='cflags.SH' --exclude=makefile.old \
12 --exclude=miniperl --exclude=generate_uudmap --exclude=patches * | ( cd ${D}${PTEST_PATH} && tar -x ) 16 --exclude=miniperl --exclude=generate_uudmap --exclude=patches * | ( cd ${D}${PTEST_PATH} && tar -x )
13 17
14 sed -i -e "s,${D},,g" \ 18 ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/perl
19
20 # Remove build host references from various scattered files...
21 find "${D}${PTEST_PATH}" \
22 \( -name '*.PL' -o -name 'myconfig' -o -name 'cflags' -o -name '*.pl' -o -name '*.sh' -o -name '*.pm' \
23 -o -name 'h2xs' -o -name 'h2ph' \
24 -o -name '*.h' -o -name 'config.sh-*' -o -name 'pod2man' -o -name 'pod2text' \) \
25 -type f -exec sed -i \
26 -e "s,${D},,g" \
15 -e "s,--sysroot=${STAGING_DIR_HOST},,g" \ 27 -e "s,--sysroot=${STAGING_DIR_HOST},,g" \
16 -e "s,-isystem${STAGING_INCDIR} ,,g" \ 28 -e "s,-isystem${STAGING_INCDIR} ,,g" \
29 -e 's|${DEBUG_PREFIX_MAP}||g' \
30 -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
17 -e "s,${STAGING_LIBDIR},${libdir},g" \ 31 -e "s,${STAGING_LIBDIR},${libdir},g" \
18 -e "s,${STAGING_BINDIR},${bindir},g" \ 32 -e "s,${STAGING_BINDIR},${bindir},g" \
19 -e "s,${STAGING_INCDIR},${includedir},g" \ 33 -e "s,${STAGING_INCDIR},${includedir},g" \
20 -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
21 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ 34 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
22 -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \ 35 -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \
23 ${D}${PTEST_PATH}/lib/Config.pm \ 36 -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
24 ${D}${PTEST_PATH}/cpan/podlators/scripts/pod2man \ 37 -e 's:${RECIPE_SYSROOT}::g' \
25 ${D}${PTEST_PATH}/cpan/podlators/scripts/pod2text 38 {} +
26 39
27 ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/perl 40 # Remove a useless timestamp...
28 # Remove plan9 related stuff 41 sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst
29 rm -rf ${D}${PTEST_PATH}/plan9 ${D}${PTEST_PATH}/README.plan9 ${D}${PTEST_PATH}/pod/perlplan9.pod
30} 42}
31 43
32python populate_packages_prepend() { 44python populate_packages_prepend() {
diff --git a/meta/recipes-devtools/perl/perl/perl-test-customized.patch b/meta/recipes-devtools/perl/perl/perl-test-customized.patch
index 90e4dcd5fb..1d9a56d4c1 100644
--- a/meta/recipes-devtools/perl/perl/perl-test-customized.patch
+++ b/meta/recipes-devtools/perl/perl/perl-test-customized.patch
@@ -32,7 +32,7 @@ index defeae1..b5d3c46 100644
32 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 0e1e4c25eddb999fec6c4dc66593f76db34cfd16 32 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 0e1e4c25eddb999fec6c4dc66593f76db34cfd16
33-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm bfd2aa00ca4ed251f342e1d1ad704abbaf5a615e 33-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm bfd2aa00ca4ed251f342e1d1ad704abbaf5a615e
34-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 5529ae3064365eafd99536621305d52f4ab31b45 34-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 5529ae3064365eafd99536621305d52f4ab31b45
35+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm d593d8fdc5c0ebcb6d3701c70fc6640c50d93455 35+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm f1ca5ec247eb69ba13a269f34dc205da37b61244
36+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1 36+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1
37 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm bc88b275af73b8faac6abd59a9aad3f625925810 37 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm bc88b275af73b8faac6abd59a9aad3f625925810
38 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 062e5d14a803fbbec8d61803086a3d7997e8a473 38 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 062e5d14a803fbbec8d61803086a3d7997e8a473
diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb
index ab0462411f..0baf3abb60 100644
--- a/meta/recipes-devtools/perl/perl_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
@@ -244,6 +244,7 @@ perl_package_preprocess () {
244 -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \ 244 -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
245 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ 245 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
246 -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \ 246 -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \
247 -e 's:${RECIPE_SYSROOT}::g' \
247 ${PKGD}${bindir}/h2xs \ 248 ${PKGD}${bindir}/h2xs \
248 ${PKGD}${bindir}/h2ph \ 249 ${PKGD}${bindir}/h2ph \
249 ${PKGD}${bindir}/pod2man \ 250 ${PKGD}${bindir}/pod2man \