diff options
Diffstat (limited to 'meta-perl/recipes-perl/libconfig')
| -rw-r--r-- | meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch | 42 | ||||
| -rw-r--r-- | meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb | 16 |
2 files changed, 57 insertions, 1 deletions
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 @@ | |||
| 1 | From 5ffd363a7acd4ef794eb265eaf6c42321097cd46 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sat, 25 Oct 2025 15:48:51 +0200 | ||
| 4 | Subject: [PATCH] correct libperl regex | ||
| 5 | |||
| 6 | The module expects the libperl library's format (from $Config{libperl}) | ||
| 7 | to be versionless, just simply libperl.so. However this value in the | ||
| 8 | OE builds is versioned, causing some issues. | ||
| 9 | |||
| 10 | The module transforms this value into a linker flag, and tries to link | ||
| 11 | with the library. The transformation is simple: cut off the "lib" from | ||
| 12 | the start, and everything after the last dot. | ||
| 13 | |||
| 14 | With versionless version, the transformation works: libperl.so -> perl | ||
| 15 | |||
| 16 | However with versioned library it looks like this: | ||
| 17 | libperl.so.5.99.9 -> perl.so.5.99 | ||
| 18 | which is just wrong. | ||
| 19 | |||
| 20 | This patch changes this transformation in way that throws away everything | ||
| 21 | after the first dot (instead of the last one). | ||
| 22 | |||
| 23 | Upstream-Status: Submitted [https://github.com/ambs/Config-AutoConf/pull/19] | ||
| 24 | |||
| 25 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 26 | --- | ||
| 27 | lib/Config/AutoConf.pm | 2 +- | ||
| 28 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 29 | |||
| 30 | diff --git a/lib/Config/AutoConf.pm b/lib/Config/AutoConf.pm | ||
| 31 | index 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" | |||
| 14 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ | 14 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ |
| 15 | file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" | 15 | file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" |
| 16 | 16 | ||
| 17 | SRC_URI = "${CPAN_MIRROR}/authors/id/A/AM/AMBS/Config-AutoConf-${PV}.tar.gz" | 17 | SRC_URI = "${CPAN_MIRROR}/authors/id/A/AM/AMBS/Config-AutoConf-${PV}.tar.gz \ |
| 18 | file://0001-correct-libperl-regex.patch \ | ||
| 19 | " | ||
| 18 | 20 | ||
| 19 | SRC_URI[sha256sum] = "bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023" | 21 | SRC_URI[sha256sum] = "bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023" |
| 20 | RDEPENDS:${PN} += "libcapture-tiny-perl" | 22 | RDEPENDS:${PN} += "libcapture-tiny-perl" |
| @@ -31,8 +33,20 @@ RDEPENDS:${PN} += "perl-module-scalar-util" | |||
| 31 | RDEPENDS:${PN} += "perl-module-strict" | 33 | RDEPENDS:${PN} += "perl-module-strict" |
| 32 | RDEPENDS:${PN} += "perl-module-text-parsewords" | 34 | RDEPENDS:${PN} += "perl-module-text-parsewords" |
| 33 | RDEPENDS:${PN} += "perl-module-warnings" | 35 | RDEPENDS:${PN} += "perl-module-warnings" |
| 36 | |||
| 37 | RDEPENDS:${PN}-ptest += " \ | ||
| 38 | packagegroup-core-buildessential \ | ||
| 39 | perl-dev \ | ||
| 40 | perl-module-file-glob \ | ||
| 41 | perl-module-perl-ostype \ | ||
| 42 | perl-module-metadata" | ||
| 43 | |||
| 34 | RRECOMMENDS:${PN} += "libfile-slurper-perl" | 44 | RRECOMMENDS:${PN} += "libfile-slurper-perl" |
| 35 | 45 | ||
| 46 | # One test requires perl headers (perl-dev) to compile some | ||
| 47 | # test application. | ||
| 48 | INSANE_SKIP:${PN}-ptest += "dev-deps" | ||
| 49 | |||
| 36 | S = "${UNPACKDIR}/Config-AutoConf-${PV}" | 50 | S = "${UNPACKDIR}/Config-AutoConf-${PV}" |
| 37 | 51 | ||
| 38 | inherit cpan ptest-perl | 52 | inherit cpan ptest-perl |
