diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-03-19 08:15:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-20 00:02:22 +0000 |
commit | f7b8493add9255dfa8ff80d72ad7abba4974113c (patch) | |
tree | 30c72e80611f13caa0e6f2e89c6984e5db5bf5fe /meta/recipes-devtools | |
parent | 497f76d782eef3843b99fce3c9fb55e1b7415d27 (diff) | |
download | poky-f7b8493add9255dfa8ff80d72ad7abba4974113c.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/perl-cross/files/0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch | 69 | ||||
-rw-r--r-- | meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/perl-cross/perlcross_1.3.7.bb (renamed from meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.34.0.bb | 1 |
5 files changed, 2 insertions, 129 deletions
diff --git a/meta/recipes-devtools/perl-cross/files/0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch b/meta/recipes-devtools/perl-cross/files/0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch deleted file mode 100644 index 744e4e09c3..0000000000 --- a/meta/recipes-devtools/perl-cross/files/0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From d22f2bb5afcd278b68999f5ce0362328fc8c7723 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 3 Jun 2021 18:50:56 +0200 | ||
4 | Subject: [PATCH] cnf/configure_func_sel.sh: disable thread_safe_nl_langinfo_l | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/115] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | cnf/configure_func_sel.sh | 8 ++++++-- | ||
10 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/cnf/configure_func_sel.sh b/cnf/configure_func_sel.sh | ||
13 | index f48294f..90d350d 100644 | ||
14 | --- a/cnf/configure_func_sel.sh | ||
15 | +++ b/cnf/configure_func_sel.sh | ||
16 | @@ -97,5 +97,9 @@ else | ||
17 | result "irrelevant" | ||
18 | fi | ||
19 | |||
20 | -# Assume nl_langinfo_l is threadsafe if available | ||
21 | -define d_thread_safe_nl_langinfo_l "$d_nl_langinfo_l" | ||
22 | +# thread_safe_nl_langinfo_l is not enabled by default | ||
23 | +# by upstream, and causes t/Langinfo.t to fail when it is | ||
24 | +# (starting from 5.34.0). This means the configuration is | ||
25 | +# either not well tested, or not at all tested, so we should | ||
26 | +# pick a safer option. | ||
27 | +define d_thread_safe_nl_langinfo_l "undef" | ||
diff --git a/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch b/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch deleted file mode 100644 index 386ea3f27f..0000000000 --- a/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From 19c1987b455998d2959a5fdf3d1ed911d35e70f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 2 Jan 2019 17:55:35 +0100 | ||
4 | Subject: [PATCH] configure_path.sh: do not hardcode $prefix/lib as library | ||
5 | path | ||
6 | |||
7 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/123] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | |||
10 | --- | ||
11 | cnf/configure_args.sh | 2 +- | ||
12 | cnf/configure_path.sh | 11 ++++++----- | ||
13 | 2 files changed, 7 insertions(+), 6 deletions(-) | ||
14 | |||
15 | diff --git a/cnf/configure_args.sh b/cnf/configure_args.sh | ||
16 | index 29ca4f5..3297fb3 100644 | ||
17 | --- a/cnf/configure_args.sh | ||
18 | +++ b/cnf/configure_args.sh | ||
19 | @@ -155,7 +155,7 @@ while [ $i -le $# -o -n "$n" ]; do | ||
20 | help) mode="help" ;; | ||
21 | regen|regenerate) mode="regen" ;; | ||
22 | keeplog) defuser "$a" 1 ;; | ||
23 | - prefix|html[13]dir|libsdir) defuser $a "$v" ;; | ||
24 | + prefix|html[13]dir|libsdir|libdir) defuser $a "$v" ;; | ||
25 | man[13]dir|otherlibsdir) defuser $a "$v" ;; | ||
26 | siteprefix|sitehtml[13]dir) defuser $a "$v" ;; | ||
27 | siteman[13]dir|vendorman[13]dir)defuser $a "$v" ;; | ||
28 | diff --git a/cnf/configure_path.sh b/cnf/configure_path.sh | ||
29 | index fe7eac7..bcba8b8 100644 | ||
30 | --- a/cnf/configure_path.sh | ||
31 | +++ b/cnf/configure_path.sh | ||
32 | @@ -30,6 +30,7 @@ definst() { | ||
33 | define "$1" "$installpath$v" | ||
34 | } | ||
35 | |||
36 | +define libdir "$prefix/lib" | ||
37 | define sharedir "$prefix/share" | ||
38 | define html1dir "$sharedir/doc/$perlname/html" | ||
39 | define html3dir "$sharedir/doc/$perlname/html" | ||
40 | @@ -38,16 +39,16 @@ define man1ext "1" | ||
41 | define man3dir "$sharedir/man/man3" | ||
42 | define man3ext "3" | ||
43 | define bin "$prefix/bin" | ||
44 | -define lib "$prefix/lib" | ||
45 | +define lib "$libdir" | ||
46 | define scriptdir "$prefix/bin" | ||
47 | define libsdirs ' ' | ||
48 | -defrel privlib "$prefix/lib/$package/$version" | ||
49 | -defrel archlib "$prefix/lib/$package/$version/$archname" | ||
50 | +defrel privlib "$libdir/$package/$version" | ||
51 | +defrel archlib "$libdir/$package/$version/$archname" | ||
52 | define perlpath "$prefix/bin/$perlname" | ||
53 | define d_archlib 'define' | ||
54 | |||
55 | define sitebin "$prefix/bin" | ||
56 | -defrel sitelib_stem "$prefix/lib/$package/site_perl" | ||
57 | +defrel sitelib_stem "$libdir/$package/site_perl" | ||
58 | define sitelib "$sitelib_stem/$version" | ||
59 | define sitearch "$sitelib_stem/$version/$archname" | ||
60 | define siteprefix "$prefix" | ||
61 | @@ -145,7 +146,7 @@ vendortest() { | ||
62 | } | ||
63 | |||
64 | vendorpath vendorbin "$vendorprefix/bin" | ||
65 | -vendorpath vendorlib_stem "$vendorprefix/lib/$package/vendor_perl" | ||
66 | +vendorpath vendorlib_stem "$libdir/$package/vendor_perl" | ||
67 | vendorpath vendorlib "$vendorlib_stem/$version" | ||
68 | vendorpath vendorarch "$vendorlib_stem/$version/$archname" | ||
69 | vendorpath vendorscript "$vendorprefix/bin" | ||
diff --git a/meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch b/meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch deleted file mode 100644 index 1d90b0fda7..0000000000 --- a/meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From a66811c487ecf8ba8724879c253bb10dfa82aeb5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 1 Jun 2018 19:57:32 +0300 | ||
4 | Subject: [PATCH] configure_tool.sh: do not quote the argument to 'command' | ||
5 | |||
6 | As it seems to break things if the argument has spaces and arguments in it. | ||
7 | |||
8 | Upstream-Status: Backport [443f7bd08b19e71a2e838dcb6cde176998cd350f] | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | cnf/configure_tool.sh | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/cnf/configure_tool.sh b/cnf/configure_tool.sh | ||
15 | index 32201c0..461bc68 100644 | ||
16 | --- a/cnf/configure_tool.sh | ||
17 | +++ b/cnf/configure_tool.sh | ||
18 | @@ -2,7 +2,7 @@ | ||
19 | |||
20 | tryprog() { | ||
21 | log "trying $1=$2" | ||
22 | - if command -v "$2" 1>/dev/null 2>/dev/null; then | ||
23 | + if command -v $2 1>/dev/null 2>/dev/null; then | ||
24 | define "$1" "$2" | ||
25 | result "$2" | ||
26 | return 0 | ||
27 | -- | ||
28 | 2.17.0 | ||
29 | |||
diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb b/meta/recipes-devtools/perl-cross/perlcross_1.3.7.bb index 75d5ea6d36..99a9ca1027 100644 --- a/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +++ b/meta/recipes-devtools/perl-cross/perlcross_1.3.7.bb | |||
@@ -12,16 +12,13 @@ inherit allarch | |||
12 | 12 | ||
13 | SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-cross \ | 13 | SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-cross \ |
14 | file://README.md \ | 14 | file://README.md \ |
15 | file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ | ||
16 | file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ | 15 | file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ |
17 | file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ | ||
18 | file://determinism.patch \ | 16 | file://determinism.patch \ |
19 | file://0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch \ | ||
20 | file://0001-Makefile-check-the-file-if-patched-or-not.patch \ | 17 | file://0001-Makefile-check-the-file-if-patched-or-not.patch \ |
21 | " | 18 | " |
22 | UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/" | 19 | UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/" |
23 | 20 | ||
24 | SRC_URI[perl-cross.sha256sum] = "4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5" | 21 | SRC_URI[perl-cross.sha256sum] = "77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335" |
25 | 22 | ||
26 | S = "${WORKDIR}/perl-cross-${PV}" | 23 | S = "${WORKDIR}/perl-cross-${PV}" |
27 | 24 | ||
diff --git a/meta/recipes-devtools/perl/perl_5.34.0.bb b/meta/recipes-devtools/perl/perl_5.34.0.bb index 73fd2e0a79..b66931c77e 100644 --- a/meta/recipes-devtools/perl/perl_5.34.0.bb +++ b/meta/recipes-devtools/perl/perl_5.34.0.bb | |||
@@ -57,6 +57,7 @@ do_configure:class-target() { | |||
57 | -Dusethreads \ | 57 | -Dusethreads \ |
58 | -Dsoname=libperl.so.5 \ | 58 | -Dsoname=libperl.so.5 \ |
59 | -Dvendorprefix=${prefix} \ | 59 | -Dvendorprefix=${prefix} \ |
60 | -Dvendorlibdir=${libdir} \ | ||
60 | -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \ | 61 | -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \ |
61 | -Dlibpth='${libdir} ${base_libdir}' \ | 62 | -Dlibpth='${libdir} ${base_libdir}' \ |
62 | -Dglibpth='${libdir} ${base_libdir}' \ | 63 | -Dglibpth='${libdir} ${base_libdir}' \ |