summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2024-02-02 21:59:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-05 14:06:09 +0000
commit61b199d10319746c3732dc82a4b15fe9ec85776a (patch)
treeb971c6cf9b2cde564cd4b12e393f1e890e44270e /meta
parentb73804429ca04672232e52eaae3de089de99b18e (diff)
downloadpoky-61b199d10319746c3732dc82a4b15fe9ec85776a.tar.gz
libxml-parser-perl: upgrade 2.46 -> 2.47
* Drop CheckLib.pm patch; no longer applies * Change to CPAN_MIRROR for SRC_URI * Drop SRC_URI[md5sum] * Drop redundant ptest-perl/run-ptest; ptest-perl inherit does this * Drop sed for Expat/Makefile; no longer shipped * Inherit pkgconfig to find expat lib * Patch Makefile.PL to not try to load host expat License-Update: Use LICENSE file; change to Artistic-2.0 https://metacpan.org/dist/XML-Parser/changes 2.47 2023-12-28 (by Todd Rinaldo) - #84 use $fh instead of $foo - #85 Fix typo in documentation - #89 Devel::CheckLib to from 0.99 -> 1.14 - Devel::CheckLibn 1.16 - #91 POD fix for verbatim text - #97 Add a LICENSE file - #94 Don't ship Expat/Makefile - Various github workflow improvements. Windows is still not working. (From OE-Core rev: 5c51810772a6611a37b2c1b0a32d9558007c4cf7) Signed-off-by: Tim Orling <tim.orling@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/perl/files/0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch24
-rw-r--r--meta/recipes-devtools/perl/libxml-parser-perl/0001-Makefile.PL-make-check_lib-cross-friendly.patch28
-rw-r--r--meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb59
-rw-r--r--meta/recipes-devtools/perl/libxml-parser-perl_2.47.bb42
4 files changed, 70 insertions, 83 deletions
diff --git a/meta/recipes-devtools/perl/files/0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch b/meta/recipes-devtools/perl/files/0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch
deleted file mode 100644
index c5bbe7888e..0000000000
--- a/meta/recipes-devtools/perl/files/0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From a033c9ece12b6eead48eed63f106ccdec6159b0c Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Dec 2019 16:26:55 +0100
4Subject: [PATCH] CheckLib.pm: do not attempt to run a cross executable
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 inc/Devel/CheckLib.pm | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/inc/Devel/CheckLib.pm b/inc/Devel/CheckLib.pm
13index 36a451a..b04acc1 100644
14--- a/inc/Devel/CheckLib.pm
15+++ b/inc/Devel/CheckLib.pm
16@@ -330,7 +330,7 @@ sub assert_lib {
17 push @missing, $lib if $rv != 0 || !-x $exefile;
18 my $absexefile = File::Spec->rel2abs($exefile);
19 $absexefile = '"' . $absexefile . '"' if $absexefile =~ m/\s/;
20- push @wrongresult, $lib if $rv == 0 && -x $exefile && system($absexefile) != 0;
21+ push @wrongresult, $lib if $rv == 0 && -x $exefile && 0 != 0;
22 unlink $ofile if -e $ofile;
23 _cleanup_exe($exefile);
24 }
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl/0001-Makefile.PL-make-check_lib-cross-friendly.patch b/meta/recipes-devtools/perl/libxml-parser-perl/0001-Makefile.PL-make-check_lib-cross-friendly.patch
new file mode 100644
index 0000000000..457fb77384
--- /dev/null
+++ b/meta/recipes-devtools/perl/libxml-parser-perl/0001-Makefile.PL-make-check_lib-cross-friendly.patch
@@ -0,0 +1,28 @@
1From bd9b0e10843da72276982bd1394ade734fea0289 Mon Sep 17 00:00:00 2001
2From: Tim Orling <tim.orling@konsulko.com>
3Date: Fri, 2 Feb 2024 21:15:34 -0800
4Subject: [PATCH] Makefile.PL: make check_lib cross friendly
5
6lib => qw(expat) does not seem to respect EXPATLIBPATH and
7EXPATINCPATH when we are cross-compiling.
8
9Upstream-Status: Inappropriate [OE specific]
10
11Signed-off-by: Tim Orling <tim.orling@konsulko.com>
12---
13 Makefile.PL | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/Makefile.PL b/Makefile.PL
17index 505d1df..19f428b 100644
18--- a/Makefile.PL
19+++ b/Makefile.PL
20@@ -30,7 +30,7 @@ foreach (@ARGV) {
21
22 unless (
23 check_lib( # fill in what you prompted the user for here
24- lib => [qw(expat)],
25+ #lib => [qw(expat)],
26 header => ['expat.h'],
27 incpath => $expat_incpath,
28 ( $expat_libpath ? ( libpath => $expat_libpath ) : () ),
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb
deleted file mode 100644
index 6cd40bd292..0000000000
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.46.bb
+++ /dev/null
@@ -1,59 +0,0 @@
1SUMMARY = "XML::Parser - A perl module for parsing XML documents"
2HOMEPAGE = "https://libexpat.github.io/"
3SECTION = "libs"
4LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
5LIC_FILES_CHKSUM = "file://Parser.pm;beginline=1;endline=7;md5=d12cc778c80fc4c518f0e5dee29fd5fb"
6
7DEPENDS += "expat"
8
9SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz \
10 file://ptest-perl/run-ptest \
11 file://0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch \
12 "
13SRC_URI[md5sum] = "80bb18a8e6240fcf7ec2f7b57601c170"
14SRC_URI[sha256sum] = "d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d"
15
16S = "${WORKDIR}/XML-Parser-${PV}"
17
18EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} CC='${CC}' LD='${CCLD}' FULL_AR='${AR}'"
19
20inherit cpan ptest-perl
21
22# fix up sub MakeMaker project as arguments don't get propagated though
23# see https://rt.cpan.org/Public/Bug/Display.html?id=28632
24do_configure:append:class-target() {
25 sed -E \
26 -e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' \
27 -i Makefile Expat/Makefile
28}
29
30do_configure:append() {
31 sed -e 's:--sysroot=.*\(\s\|$\):--sysroot=${STAGING_DIR_TARGET} :g' \
32 -i Makefile Expat/Makefile
33 sed 's:^FULL_AR = .*:FULL_AR = ${AR}:g' -i Expat/Makefile
34 # make sure these two do not build in parallel
35 sed 's!^$(INST_DYNAMIC):!$(INST_DYNAMIC): $(BOOTSTRAP)!' -i Expat/Makefile
36}
37
38do_compile() {
39 export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')"
40 cpan_do_compile
41}
42
43do_compile:class-native() {
44 cpan_do_compile
45}
46
47do_install_ptest() {
48 sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlstats
49 sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlfilter
50 sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlcomments
51 sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/canonical
52 cp -r ${B}/samples ${D}${PTEST_PATH}
53 chown -R root:root ${D}${PTEST_PATH}/samples
54}
55
56RDEPENDS:${PN} += "perl-module-carp perl-module-file-spec"
57RDEPENDS:${PN}-ptest += "perl-module-filehandle perl-module-if perl-module-test perl-module-test-more"
58
59BBCLASSEXTEND="native nativesdk"
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.47.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.47.bb
new file mode 100644
index 0000000000..cffc133a45
--- /dev/null
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.47.bb
@@ -0,0 +1,42 @@
1SUMMARY = "XML::Parser - A perl module for parsing XML documents"
2HOMEPAGE = "https://libexpat.github.io/"
3SECTION = "libs"
4LICENSE = "Artistic-2.0"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=4342f85bf14a1fdd6a751573f1e61c03"
6
7DEPENDS += "expat"
8
9SRC_URI = "${CPAN_MIRROR}/modules/by-module/XML/XML-Parser-${PV}.tar.gz \
10 file://0001-Makefile.PL-make-check_lib-cross-friendly.patch \
11 "
12
13SRC_URI[sha256sum] = "ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8"
14
15S = "${WORKDIR}/XML-Parser-${PV}"
16
17EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} CC='${CC}' LD='${CCLD}' FULL_AR='${AR}'"
18
19inherit cpan pkgconfig ptest-perl
20
21do_compile() {
22 export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')"
23 cpan_do_compile
24}
25
26do_compile:class-native() {
27 cpan_do_compile
28}
29
30do_install_ptest() {
31 sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlstats
32 sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlfilter
33 sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlcomments
34 sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/canonical
35 cp -r ${B}/samples ${D}${PTEST_PATH}
36 chown -R root:root ${D}${PTEST_PATH}/samples
37}
38
39RDEPENDS:${PN} += "perl-module-carp perl-module-file-spec"
40RDEPENDS:${PN}-ptest += "perl-module-filehandle perl-module-if perl-module-test perl-module-test-more"
41
42BBCLASSEXTEND="native nativesdk"