summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-perl/conf/include/ptest-packagelists-meta-perl.inc2
-rw-r--r--meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch42
-rw-r--r--meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb16
3 files changed, 58 insertions, 2 deletions
diff --git a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
index 7488da3351..ef0c59dc2f 100644
--- a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
+++ b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
@@ -9,6 +9,7 @@
9PTESTS_FAST_META_PERL = "\ 9PTESTS_FAST_META_PERL = "\
10 libauthen-sasl-perl \ 10 libauthen-sasl-perl \
11 libcapture-tiny-perl \ 11 libcapture-tiny-perl \
12 libconfig-autoconf-perl \
12 libcrypt-openssl-guess-perl \ 13 libcrypt-openssl-guess-perl \
13 libcrypt-openssl-random-perl \ 14 libcrypt-openssl-random-perl \
14 libcrypt-openssl-rsa-perl \ 15 libcrypt-openssl-rsa-perl \
@@ -47,7 +48,6 @@ PTESTS_SLOW_META_PERL = "\
47" 48"
48 49
49PTESTS_PROBLEMS_META_PERL = "\ 50PTESTS_PROBLEMS_META_PERL = "\
50 libconfig-autoconf-perl \
51 libhtml-parser-perl \ 51 libhtml-parser-perl \
52 libunix-statgrab \ 52 libunix-statgrab \
53 libxml-libxml-perl \ 53 libxml-libxml-perl \
diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch
new file mode 100644
index 0000000000..373f773070
--- /dev/null
+++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch
@@ -0,0 +1,42 @@
1From 5ffd363a7acd4ef794eb265eaf6c42321097cd46 Mon Sep 17 00:00:00 2001
2From: Gyorgy Sarvari <skandigraun@gmail.com>
3Date: Sat, 25 Oct 2025 15:48:51 +0200
4Subject: [PATCH] correct libperl regex
5
6The module expects the libperl library's format (from $Config{libperl})
7to be versionless, just simply libperl.so. However this value in the
8OE builds is versioned, causing some issues.
9
10The module transforms this value into a linker flag, and tries to link
11with the library. The transformation is simple: cut off the "lib" from
12the start, and everything after the last dot.
13
14With versionless version, the transformation works: libperl.so -> perl
15
16However with versioned library it looks like this:
17libperl.so.5.99.9 -> perl.so.5.99
18which is just wrong.
19
20This patch changes this transformation in way that throws away everything
21after the first dot (instead of the last one).
22
23Upstream-Status: Submitted [https://github.com/ambs/Config-AutoConf/pull/19]
24
25Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
26---
27 lib/Config/AutoConf.pm | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-)
29
30diff --git a/lib/Config/AutoConf.pm b/lib/Config/AutoConf.pm
31index 0bba5a4..a2e7099 100644
32--- a/lib/Config/AutoConf.pm
33+++ b/lib/Config/AutoConf.pm
34@@ -3001,7 +3001,7 @@ sub _check_link_perlapi
35
36 my $libperl = $Config{libperl};
37 $libperl =~ s/^lib//;
38- $libperl =~ s/\.[^\.]*$//;
39+ $libperl =~ s/^([^\.]*)\..*$/$1/;
40
41 push @{$self->{extra_link_flags}}, "-L" . File::Spec->catdir($Config{installarchlib}, "CORE");
42 push @{$self->{extra_libs}}, "$libperl";
diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb
index d8ca2ae247..5c233ed22d 100644
--- a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb
+++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb
@@ -14,7 +14,9 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
14LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ 14LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
15file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" 15file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61"
16 16
17SRC_URI = "${CPAN_MIRROR}/authors/id/A/AM/AMBS/Config-AutoConf-${PV}.tar.gz" 17SRC_URI = "${CPAN_MIRROR}/authors/id/A/AM/AMBS/Config-AutoConf-${PV}.tar.gz \
18 file://0001-correct-libperl-regex.patch \
19 "
18 20
19SRC_URI[sha256sum] = "bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023" 21SRC_URI[sha256sum] = "bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023"
20RDEPENDS:${PN} += "libcapture-tiny-perl" 22RDEPENDS:${PN} += "libcapture-tiny-perl"
@@ -31,8 +33,20 @@ RDEPENDS:${PN} += "perl-module-scalar-util"
31RDEPENDS:${PN} += "perl-module-strict" 33RDEPENDS:${PN} += "perl-module-strict"
32RDEPENDS:${PN} += "perl-module-text-parsewords" 34RDEPENDS:${PN} += "perl-module-text-parsewords"
33RDEPENDS:${PN} += "perl-module-warnings" 35RDEPENDS:${PN} += "perl-module-warnings"
36
37RDEPENDS:${PN}-ptest += " \
38 packagegroup-core-buildessential \
39 perl-dev \
40 perl-module-file-glob \
41 perl-module-perl-ostype \
42 perl-module-metadata"
43
34RRECOMMENDS:${PN} += "libfile-slurper-perl" 44RRECOMMENDS:${PN} += "libfile-slurper-perl"
35 45
46# One test requires perl headers (perl-dev) to compile some
47# test application.
48INSANE_SKIP:${PN}-ptest += "dev-deps"
49
36S = "${UNPACKDIR}/Config-AutoConf-${PV}" 50S = "${UNPACKDIR}/Config-AutoConf-${PV}"
37 51
38inherit cpan ptest-perl 52inherit cpan ptest-perl