mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
perl-cross: update 1.3.6 -> 1.3.7
Drop upstreamed patches. 0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch is replaced with a tweak to configure parameters. (From OE-Core rev: 1b2e235b5012c21939ced51e16f1305ad8dea75d) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
497f76d782
commit
f7b8493add
@@ -1,27 +0,0 @@
|
||||
From d22f2bb5afcd278b68999f5ce0362328fc8c7723 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 3 Jun 2021 18:50:56 +0200
|
||||
Subject: [PATCH] cnf/configure_func_sel.sh: disable thread_safe_nl_langinfo_l
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/115]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
cnf/configure_func_sel.sh | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cnf/configure_func_sel.sh b/cnf/configure_func_sel.sh
|
||||
index f48294f..90d350d 100644
|
||||
--- a/cnf/configure_func_sel.sh
|
||||
+++ b/cnf/configure_func_sel.sh
|
||||
@@ -97,5 +97,9 @@ else
|
||||
result "irrelevant"
|
||||
fi
|
||||
|
||||
-# Assume nl_langinfo_l is threadsafe if available
|
||||
-define d_thread_safe_nl_langinfo_l "$d_nl_langinfo_l"
|
||||
+# thread_safe_nl_langinfo_l is not enabled by default
|
||||
+# by upstream, and causes t/Langinfo.t to fail when it is
|
||||
+# (starting from 5.34.0). This means the configuration is
|
||||
+# either not well tested, or not at all tested, so we should
|
||||
+# pick a safer option.
|
||||
+define d_thread_safe_nl_langinfo_l "undef"
|
||||
@@ -1,69 +0,0 @@
|
||||
From 19c1987b455998d2959a5fdf3d1ed911d35e70f2 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 2 Jan 2019 17:55:35 +0100
|
||||
Subject: [PATCH] configure_path.sh: do not hardcode $prefix/lib as library
|
||||
path
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/123]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
cnf/configure_args.sh | 2 +-
|
||||
cnf/configure_path.sh | 11 ++++++-----
|
||||
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/cnf/configure_args.sh b/cnf/configure_args.sh
|
||||
index 29ca4f5..3297fb3 100644
|
||||
--- a/cnf/configure_args.sh
|
||||
+++ b/cnf/configure_args.sh
|
||||
@@ -155,7 +155,7 @@ while [ $i -le $# -o -n "$n" ]; do
|
||||
help) mode="help" ;;
|
||||
regen|regenerate) mode="regen" ;;
|
||||
keeplog) defuser "$a" 1 ;;
|
||||
- prefix|html[13]dir|libsdir) defuser $a "$v" ;;
|
||||
+ prefix|html[13]dir|libsdir|libdir) defuser $a "$v" ;;
|
||||
man[13]dir|otherlibsdir) defuser $a "$v" ;;
|
||||
siteprefix|sitehtml[13]dir) defuser $a "$v" ;;
|
||||
siteman[13]dir|vendorman[13]dir)defuser $a "$v" ;;
|
||||
diff --git a/cnf/configure_path.sh b/cnf/configure_path.sh
|
||||
index fe7eac7..bcba8b8 100644
|
||||
--- a/cnf/configure_path.sh
|
||||
+++ b/cnf/configure_path.sh
|
||||
@@ -30,6 +30,7 @@ definst() {
|
||||
define "$1" "$installpath$v"
|
||||
}
|
||||
|
||||
+define libdir "$prefix/lib"
|
||||
define sharedir "$prefix/share"
|
||||
define html1dir "$sharedir/doc/$perlname/html"
|
||||
define html3dir "$sharedir/doc/$perlname/html"
|
||||
@@ -38,16 +39,16 @@ define man1ext "1"
|
||||
define man3dir "$sharedir/man/man3"
|
||||
define man3ext "3"
|
||||
define bin "$prefix/bin"
|
||||
-define lib "$prefix/lib"
|
||||
+define lib "$libdir"
|
||||
define scriptdir "$prefix/bin"
|
||||
define libsdirs ' '
|
||||
-defrel privlib "$prefix/lib/$package/$version"
|
||||
-defrel archlib "$prefix/lib/$package/$version/$archname"
|
||||
+defrel privlib "$libdir/$package/$version"
|
||||
+defrel archlib "$libdir/$package/$version/$archname"
|
||||
define perlpath "$prefix/bin/$perlname"
|
||||
define d_archlib 'define'
|
||||
|
||||
define sitebin "$prefix/bin"
|
||||
-defrel sitelib_stem "$prefix/lib/$package/site_perl"
|
||||
+defrel sitelib_stem "$libdir/$package/site_perl"
|
||||
define sitelib "$sitelib_stem/$version"
|
||||
define sitearch "$sitelib_stem/$version/$archname"
|
||||
define siteprefix "$prefix"
|
||||
@@ -145,7 +146,7 @@ vendortest() {
|
||||
}
|
||||
|
||||
vendorpath vendorbin "$vendorprefix/bin"
|
||||
-vendorpath vendorlib_stem "$vendorprefix/lib/$package/vendor_perl"
|
||||
+vendorpath vendorlib_stem "$libdir/$package/vendor_perl"
|
||||
vendorpath vendorlib "$vendorlib_stem/$version"
|
||||
vendorpath vendorarch "$vendorlib_stem/$version/$archname"
|
||||
vendorpath vendorscript "$vendorprefix/bin"
|
||||
@@ -1,29 +0,0 @@
|
||||
From a66811c487ecf8ba8724879c253bb10dfa82aeb5 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 1 Jun 2018 19:57:32 +0300
|
||||
Subject: [PATCH] configure_tool.sh: do not quote the argument to 'command'
|
||||
|
||||
As it seems to break things if the argument has spaces and arguments in it.
|
||||
|
||||
Upstream-Status: Backport [443f7bd08b19e71a2e838dcb6cde176998cd350f]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
cnf/configure_tool.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cnf/configure_tool.sh b/cnf/configure_tool.sh
|
||||
index 32201c0..461bc68 100644
|
||||
--- a/cnf/configure_tool.sh
|
||||
+++ b/cnf/configure_tool.sh
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
tryprog() {
|
||||
log "trying $1=$2"
|
||||
- if command -v "$2" 1>/dev/null 2>/dev/null; then
|
||||
+ if command -v $2 1>/dev/null 2>/dev/null; then
|
||||
define "$1" "$2"
|
||||
result "$2"
|
||||
return 0
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@@ -12,16 +12,13 @@ inherit allarch
|
||||
|
||||
SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-cross \
|
||||
file://README.md \
|
||||
file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
|
||||
file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \
|
||||
file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
|
||||
file://determinism.patch \
|
||||
file://0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch \
|
||||
file://0001-Makefile-check-the-file-if-patched-or-not.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/"
|
||||
|
||||
SRC_URI[perl-cross.sha256sum] = "4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5"
|
||||
SRC_URI[perl-cross.sha256sum] = "77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335"
|
||||
|
||||
S = "${WORKDIR}/perl-cross-${PV}"
|
||||
|
||||
@@ -57,6 +57,7 @@ do_configure:class-target() {
|
||||
-Dusethreads \
|
||||
-Dsoname=libperl.so.5 \
|
||||
-Dvendorprefix=${prefix} \
|
||||
-Dvendorlibdir=${libdir} \
|
||||
-Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \
|
||||
-Dlibpth='${libdir} ${base_libdir}' \
|
||||
-Dglibpth='${libdir} ${base_libdir}' \
|
||||
|
||||
Reference in New Issue
Block a user