diff options
| -rw-r--r-- | meta/recipes-devtools/perl-sanity/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch | 16 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl-sanity/perl-ptest.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl-sanity/perl_5.28.0.bb (renamed from meta/recipes-devtools/perl-sanity/perl_5.26.2.bb) | 29 |
3 files changed, 27 insertions, 20 deletions
diff --git a/meta/recipes-devtools/perl-sanity/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch b/meta/recipes-devtools/perl-sanity/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch index be740739301..7d5c079b2d0 100644 --- a/meta/recipes-devtools/perl-sanity/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch +++ b/meta/recipes-devtools/perl-sanity/files/0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch @@ -1,4 +1,4 @@ -From 0bff8a431bdd3c0b1d165bb76c88b6497e92e0bb Mon Sep 17 00:00:00 2001 +From 2f74a899474f428a4a5368a94accf801c5f97ae4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 4 Jun 2018 18:33:50 +0300 Subject: [PATCH] ExtUtils-MakeMaker: add $(LDFLAGS) when linking binary @@ -6,23 +6,21 @@ Subject: [PATCH] ExtUtils-MakeMaker: add $(LDFLAGS) when linking binary Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -index 66a24d7..948c476 100644 +index fe53be1..249c048 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -1044,7 +1044,7 @@ sub xs_make_dynamic_lib { +@@ -1050,7 +1050,7 @@ sub xs_make_dynamic_lib { } - push @m, sprintf <<'MAKE', $ld_run_path_shell, $ldrun, $ldfrom, $self->xs_obj_opt('$@'), $libs, $exportlist; -- %s$(LD) %s $(LDDLFLAGS) %s $(OTHERLDFLAGS) %s $(MYEXTLIB) \ -+ %s$(LD) %s $(LDDLFLAGS) %s $(LDFLAGS) $(OTHERLDFLAGS) %s $(MYEXTLIB) \ + push @m, sprintf <<'MAKE', $ld_run_path_shell, $ldrun, $dlsyms_arg, $ldfrom, $self->xs_obj_opt('$@'), $libs, $exportlist; +- %s$(LD) %s $(LDDLFLAGS) %s %s $(OTHERLDFLAGS) %s $(MYEXTLIB) \ ++ %s$(LD) %s $(LDDLFLAGS) %s %s $(LDFLAGS) $(OTHERLDFLAGS) %s $(MYEXTLIB) \ $(PERL_ARCHIVE) %s $(PERL_ARCHIVE_AFTER) %s \ $(INST_DYNAMIC_FIX) $(CHMOD) $(PERM_RWX) $@ --- -2.17.0 - diff --git a/meta/recipes-devtools/perl-sanity/perl-ptest.inc b/meta/recipes-devtools/perl-sanity/perl-ptest.inc index 5d4422053c8..d534017a640 100644 --- a/meta/recipes-devtools/perl-sanity/perl-ptest.inc +++ b/meta/recipes-devtools/perl-sanity/perl-ptest.inc @@ -46,7 +46,7 @@ python populate_packages_prepend() { # do_split_packages requires a pair of () in the regex, but we have nothing # to match, so use an empty pair. if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): - do_split_packages(d, d.expand('${libdir}/perl/${PV}'), '.*\.t()', + do_split_packages(d, d.expand('${libdir}/perl5/${PV}'), '.*\.t()', '${PN}-ptest%s', '%s', recursive=True, match_path=True) } diff --git a/meta/recipes-devtools/perl-sanity/perl_5.26.2.bb b/meta/recipes-devtools/perl-sanity/perl_5.28.0.bb index 89f91a3cb23..e6baae6d7b5 100644 --- a/meta/recipes-devtools/perl-sanity/perl_5.26.2.bb +++ b/meta/recipes-devtools/perl-sanity/perl_5.28.0.bb @@ -3,20 +3,21 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "devel" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ - file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3" + file://Artistic;md5=71a4d5d9acc18c0952a6df2218bb68da \ + " SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ - https://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.tar.gz;name=perl-cross \ + https://github.com/arsv/perl-cross/releases/download/1.2/perl-cross-1.2.tar.gz;name=perl-cross \ file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ file://0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch \ " -SRC_URI[perl.md5sum] = "dc0fea097f3992a8cd53f8ac0810d523" -SRC_URI[perl.sha256sum] = "572f9cea625d6062f8a63b5cee9d3ee840800a001d2bb201a41b9a177ab7f70d" -SRC_URI[perl-cross.md5sum] = "af8f6f288019e670f0fdf7de4f28cd12" -SRC_URI[perl-cross.sha256sum] = "0bbb450e48d07e7fdf867d578b1780ac8f0e8dc284d52301dac4d763b42f6041" +SRC_URI[perl.md5sum] = "c7c63781745e280e08401a306a83bfb8" +SRC_URI[perl.sha256sum] = "7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8" +SRC_URI[perl-cross.md5sum] = "2d702f8fa1dba84d0a62de30e8a9c263" +SRC_URI[perl-cross.sha256sum] = "599077beb86af5e6097da8922a84474a5484f61475d2899eae0f8634e9619109" S = "${WORKDIR}/perl-${PV}" @@ -31,15 +32,15 @@ do_copy_perlcross() { } do_configure_class-target() { - ./configure --prefix=${prefix} --target=${TARGET_SYS} + ./configure --prefix=${prefix} --target=${TARGET_SYS} -Dvendorprefix=${prefix} } do_configure_class-nativesdk() { - ./configure --prefix=${prefix} --target=${TARGET_SYS} + ./configure --prefix=${prefix} --target=${TARGET_SYS} -Dvendorprefix=${prefix} } do_configure() { - ./configure --prefix=${prefix} + ./configure --prefix=${prefix} -Dvendorprefix=${prefix} } do_compile() { @@ -50,6 +51,15 @@ do_compile() { do_install() { oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${libdir}/perl + install -d ${D}${libdir}/perl/${PV}/ + install -d ${D}${libdir}/perl/${PV}/ExtUtils/ + + # Save native config + install config.sh ${D}${libdir}/perl + install lib/Config.pm ${D}${libdir}/perl/${PV}/ + install lib/ExtUtils/typemap ${D}${libdir}/perl/${PV}/ExtUtils/ } do_install_append_class-native () { @@ -128,4 +138,3 @@ PACKAGES_append = " ${PN}-misc" RDEPENDS_${PN}-misc += "perl perl-modules" BBCLASSEXTEND = "native nativesdk" - |