diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/perl/perl_5.24.1.bb')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/perl/perl_5.24.1.bb | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl_5.24.1.bb b/import-layers/yocto-poky/meta/recipes-devtools/perl/perl_5.24.1.bb index b55d2223e2..91f310d421 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl_5.24.1.bb +++ b/import-layers/yocto-poky/meta/recipes-devtools/perl/perl_5.24.1.bb @@ -1,8 +1,7 @@ require perl.inc # We need gnugrep (for -I) -DEPENDS = "virtual/db grep-native" -DEPENDS += "gdbm zlib" +DEPENDS = "db grep-native gdbm zlib virtual/crypt" # Pick up patches from debian # http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.22.0-1.debian.tar.xz @@ -46,7 +45,6 @@ SRC_URI += " \ file://letgcc-find-errno.patch \ file://generate-sh.patch \ file://native-perlinc.patch \ - file://perl-enable-gdbm.patch \ file://cross-generate_uudmap.patch \ file://fix_bad_rpath.patch \ file://dynaloaderhack.patch \ @@ -65,6 +63,9 @@ SRC_URI += " \ file://perl-errno-generation-gcc5.patch \ file://perl-fix-conflict-between-skip_all-and-END.patch \ file://perl-test-customized.patch \ + file://perl-5.26.1-guard_old_libcrypt_fix.patch \ + file://CVE-2017-12883.patch \ + file://CVE-2017-12837.patch \ " # Fix test case issues @@ -189,6 +190,19 @@ do_compile() { oe_runmake perl LD="${CCLD}" } +do_compile_append_class-target() { + # Remove build host references from numerous comments... + find "${S}/cpan/Encode" -type f \ + \( -name '*.exh' -o -name '*.c' -o -name '*.h' \)\ + -exec sed -i -e 's:${RECIPE_SYSROOT_NATIVE}::g' {} + + sed -i -e 's:${RECIPE_SYSROOT}::g' ${S}/perl.h ${S}/pp.h + sed -i -e 's:${RECIPE_SYSROOT_NATIVE}/usr/bin/perl-native/perl${PV}.real:/usr/bin/perl${PV}:g' \ + ${S}/cpan/Compress-Raw-Bzip2/constants.h \ + ${S}/cpan/Compress-Raw-Zlib/constants.h \ + ${S}/cpan/IPC-SysV/const-c.inc \ + ${S}/dist/Time-HiRes/const-c.inc +} + do_install() { #export hostperl="${STAGING_BINDIR_NATIVE}/perl-native/perl${PV}" oe_runmake install DESTDIR=${D} @@ -232,6 +246,7 @@ perl_package_preprocess () { -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \ -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \ + -e 's:${RECIPE_SYSROOT}::g' \ ${PKGD}${bindir}/h2xs \ ${PKGD}${bindir}/h2ph \ ${PKGD}${bindir}/pod2man \ @@ -267,6 +282,7 @@ FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE" FILES_${PN}-lib = "${libdir}/libperl.so* \ ${libdir}/perl5 \ ${libdir}/perl/config.sh \ + ${libdir}/perl/${PV}/Config_git.pl \ ${libdir}/perl/${PV}/Config_heavy.pl \ ${libdir}/perl/${PV}/Config_heavy-target.pl" FILES_${PN}-pod = "${libdir}/perl/${PV}/pod \ @@ -324,7 +340,7 @@ python split_perl_packages () { d.setVar(d.expand("RRECOMMENDS_${PN}-modules"), ' '.join(packages)) } -PACKAGES_DYNAMIC += "^perl-module-.*" +PACKAGES_DYNAMIC += "^perl-module-.*(?<!\-native)$" PACKAGES_DYNAMIC_class-nativesdk += "^nativesdk-perl-module-.*" RPROVIDES_perl-lib = "perl-lib" |