mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
Tim Orling
committed by
Richard Purdie
Richard Purdie
parent
b73804429c
commit
61b199d103
@@ -1,24 +0,0 @@
|
||||
From a033c9ece12b6eead48eed63f106ccdec6159b0c Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 20 Dec 2019 16:26:55 +0100
|
||||
Subject: [PATCH] CheckLib.pm: do not attempt to run a cross executable
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
inc/Devel/CheckLib.pm | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/inc/Devel/CheckLib.pm b/inc/Devel/CheckLib.pm
|
||||
index 36a451a..b04acc1 100644
|
||||
--- a/inc/Devel/CheckLib.pm
|
||||
+++ b/inc/Devel/CheckLib.pm
|
||||
@@ -330,7 +330,7 @@ sub assert_lib {
|
||||
push @missing, $lib if $rv != 0 || !-x $exefile;
|
||||
my $absexefile = File::Spec->rel2abs($exefile);
|
||||
$absexefile = '"' . $absexefile . '"' if $absexefile =~ m/\s/;
|
||||
- push @wrongresult, $lib if $rv == 0 && -x $exefile && system($absexefile) != 0;
|
||||
+ push @wrongresult, $lib if $rv == 0 && -x $exefile && 0 != 0;
|
||||
unlink $ofile if -e $ofile;
|
||||
_cleanup_exe($exefile);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
From bd9b0e10843da72276982bd1394ade734fea0289 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Orling <tim.orling@konsulko.com>
|
||||
Date: Fri, 2 Feb 2024 21:15:34 -0800
|
||||
Subject: [PATCH] Makefile.PL: make check_lib cross friendly
|
||||
|
||||
lib => qw(expat) does not seem to respect EXPATLIBPATH and
|
||||
EXPATINCPATH when we are cross-compiling.
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific]
|
||||
|
||||
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
|
||||
---
|
||||
Makefile.PL | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index 505d1df..19f428b 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -30,7 +30,7 @@ foreach (@ARGV) {
|
||||
|
||||
unless (
|
||||
check_lib( # fill in what you prompted the user for here
|
||||
- lib => [qw(expat)],
|
||||
+ #lib => [qw(expat)],
|
||||
header => ['expat.h'],
|
||||
incpath => $expat_incpath,
|
||||
( $expat_libpath ? ( libpath => $expat_libpath ) : () ),
|
||||
@@ -1,59 +0,0 @@
|
||||
SUMMARY = "XML::Parser - A perl module for parsing XML documents"
|
||||
HOMEPAGE = "https://libexpat.github.io/"
|
||||
SECTION = "libs"
|
||||
LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://Parser.pm;beginline=1;endline=7;md5=d12cc778c80fc4c518f0e5dee29fd5fb"
|
||||
|
||||
DEPENDS += "expat"
|
||||
|
||||
SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz \
|
||||
file://ptest-perl/run-ptest \
|
||||
file://0001-CheckLib.pm-do-not-attempt-to-run-a-cross-executable.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "80bb18a8e6240fcf7ec2f7b57601c170"
|
||||
SRC_URI[sha256sum] = "d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d"
|
||||
|
||||
S = "${WORKDIR}/XML-Parser-${PV}"
|
||||
|
||||
EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} CC='${CC}' LD='${CCLD}' FULL_AR='${AR}'"
|
||||
|
||||
inherit cpan ptest-perl
|
||||
|
||||
# fix up sub MakeMaker project as arguments don't get propagated though
|
||||
# see https://rt.cpan.org/Public/Bug/Display.html?id=28632
|
||||
do_configure:append:class-target() {
|
||||
sed -E \
|
||||
-e 's:-L${STAGING_LIBDIR}::g' -e 's:-I${STAGING_INCDIR}::g' \
|
||||
-i Makefile Expat/Makefile
|
||||
}
|
||||
|
||||
do_configure:append() {
|
||||
sed -e 's:--sysroot=.*\(\s\|$\):--sysroot=${STAGING_DIR_TARGET} :g' \
|
||||
-i Makefile Expat/Makefile
|
||||
sed 's:^FULL_AR = .*:FULL_AR = ${AR}:g' -i Expat/Makefile
|
||||
# make sure these two do not build in parallel
|
||||
sed 's!^$(INST_DYNAMIC):!$(INST_DYNAMIC): $(BOOTSTRAP)!' -i Expat/Makefile
|
||||
}
|
||||
|
||||
do_compile() {
|
||||
export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')"
|
||||
cpan_do_compile
|
||||
}
|
||||
|
||||
do_compile:class-native() {
|
||||
cpan_do_compile
|
||||
}
|
||||
|
||||
do_install_ptest() {
|
||||
sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlstats
|
||||
sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlfilter
|
||||
sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlcomments
|
||||
sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/canonical
|
||||
cp -r ${B}/samples ${D}${PTEST_PATH}
|
||||
chown -R root:root ${D}${PTEST_PATH}/samples
|
||||
}
|
||||
|
||||
RDEPENDS:${PN} += "perl-module-carp perl-module-file-spec"
|
||||
RDEPENDS:${PN}-ptest += "perl-module-filehandle perl-module-if perl-module-test perl-module-test-more"
|
||||
|
||||
BBCLASSEXTEND="native nativesdk"
|
||||
42
meta/recipes-devtools/perl/libxml-parser-perl_2.47.bb
Normal file
42
meta/recipes-devtools/perl/libxml-parser-perl_2.47.bb
Normal file
@@ -0,0 +1,42 @@
|
||||
SUMMARY = "XML::Parser - A perl module for parsing XML documents"
|
||||
HOMEPAGE = "https://libexpat.github.io/"
|
||||
SECTION = "libs"
|
||||
LICENSE = "Artistic-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=4342f85bf14a1fdd6a751573f1e61c03"
|
||||
|
||||
DEPENDS += "expat"
|
||||
|
||||
SRC_URI = "${CPAN_MIRROR}/modules/by-module/XML/XML-Parser-${PV}.tar.gz \
|
||||
file://0001-Makefile.PL-make-check_lib-cross-friendly.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8"
|
||||
|
||||
S = "${WORKDIR}/XML-Parser-${PV}"
|
||||
|
||||
EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} CC='${CC}' LD='${CCLD}' FULL_AR='${AR}'"
|
||||
|
||||
inherit cpan pkgconfig ptest-perl
|
||||
|
||||
do_compile() {
|
||||
export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')"
|
||||
cpan_do_compile
|
||||
}
|
||||
|
||||
do_compile:class-native() {
|
||||
cpan_do_compile
|
||||
}
|
||||
|
||||
do_install_ptest() {
|
||||
sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlstats
|
||||
sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlfilter
|
||||
sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlcomments
|
||||
sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/canonical
|
||||
cp -r ${B}/samples ${D}${PTEST_PATH}
|
||||
chown -R root:root ${D}${PTEST_PATH}/samples
|
||||
}
|
||||
|
||||
RDEPENDS:${PN} += "perl-module-carp perl-module-file-spec"
|
||||
RDEPENDS:${PN}-ptest += "perl-module-filehandle perl-module-if perl-module-test perl-module-test-more"
|
||||
|
||||
BBCLASSEXTEND="native nativesdk"
|
||||
Reference in New Issue
Block a user