summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl-sanity/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-12-02 12:43:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:09 +0000
commitead379657b85dad0104661b9162b0b847b9391fd (patch)
tree8b6935d9d7c0a72dabd46637ce554042a654363d /meta/recipes-devtools/perl-sanity/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
parentd94ac527b3a2bf1a8330b676513062bf699fbbe3 (diff)
downloadpoky-ead379657b85dad0104661b9162b0b847b9391fd.tar.gz
perl: add a version that builds the recipe using perl-cross, and update to 5.28.1
perl-cross is a build system overlay from buildroot project that aims to bring a bit of sanity to cross-building perl. The advantage of using that is that we can drop a lot of custom patches (that no one really understands), and simplify the perl recipe as well. Also the build time goes down from several minutes to about 30 seconds. The whole thing becomes maintainable again, in my opinion. When rewriting the recipe I had two goals in mind: 1. Stay with upstream defaults as much as possible 2. Add custom patches only when their necessity was proven through testing. http://arsv.github.io/perl-cross/ (From OE-Core rev: 52f2828314f851263ca3a6beb41ec936fab4d3ab) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl-sanity/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch')
-rw-r--r--meta/recipes-devtools/perl-sanity/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl-sanity/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch b/meta/recipes-devtools/perl-sanity/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
new file mode 100644
index 0000000000..3b0fc453e5
--- /dev/null
+++ b/meta/recipes-devtools/perl-sanity/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
@@ -0,0 +1,69 @@
1From 19c1987b455998d2959a5fdf3d1ed911d35e70f2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 2 Jan 2019 17:55:35 +0100
4Subject: [PATCH] configure_path.sh: do not hardcode $prefix/lib as library
5 path
6
7Upstream-Status: Pending
8Signed-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
15diff --git a/cnf/configure_args.sh b/cnf/configure_args.sh
16index 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" ;;
28diff --git a/cnf/configure_path.sh b/cnf/configure_path.sh
29index 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"