mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
perl: split perl-cross into its own recipe
As perl and perl-cross need to be updated (and patches rebased) in lockstep, devtool upgrade (and therefore AUH) can't cope with it. Manually updating is still possible, but painful. Split determinism.patch into perl and perl-cross parts, move the rest of the perl-cross patches. (From OE-Core rev: 60dcb230f65fb1a0f23341c379676f82213d6240) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
d39cef3f82
commit
53cf53147f
-69
@@ -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: Pending
|
||||
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"
|
||||
-29
@@ -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: Pending
|
||||
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
|
||||
|
||||
-27
@@ -1,27 +0,0 @@
|
||||
From f824cbec9ac8f113a4ae35d57bd18625d415a71b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 27 Nov 2018 15:37:40 +0100
|
||||
Subject: [PATCH] perl-cross: add LDFLAGS when linking libperl
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 01644cd..be811a7 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -180,7 +180,7 @@ endif
|
||||
|
||||
ifeq ($(useshrplib),true)
|
||||
$(LIBPERL):
|
||||
- $(CC) $(LDDLFLAGS) -o $@ $(filter %$o,$^) $(LIBS)
|
||||
+ $(CC) $(LDFLAGS) $(LDDLFLAGS) -o $@ $(filter %$o,$^) $(LIBS)
|
||||
else
|
||||
$(LIBPERL):
|
||||
$(AR) cru $@ $(filter %$o,$^)
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -21,19 +21,6 @@ RP 2020/2/7
|
||||
Upstream-Status: Pending [75% submitted]
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
|
||||
|
||||
Index: perl-5.30.1/cnf/configure_mods.sh
|
||||
===================================================================
|
||||
--- perl-5.30.1.orig/cnf/configure_mods.sh
|
||||
+++ perl-5.30.1/cnf/configure_mods.sh
|
||||
@@ -82,7 +82,7 @@ extonlyif() {
|
||||
}
|
||||
|
||||
definetrimspaces() {
|
||||
- v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//'`
|
||||
+ v=`echo "$2" | sed -r -e 's/\s+/ /g' -e 's/^\s+//' -e 's/\s+$//' | xargs -n1 | LANG=C sort | xargs`
|
||||
define $1 "$v"
|
||||
}
|
||||
|
||||
Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
|
||||
===================================================================
|
||||
--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL
|
||||
@@ -56,13 +43,3 @@ Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
|
||||
{
|
||||
print FILELIST $self->catfile($dir,$file) . "\n";
|
||||
}
|
||||
Index: perl-5.30.1/cnf/configure
|
||||
===================================================================
|
||||
--- perl-5.30.1.orig/cnf/configure
|
||||
+++ perl-5.30.1/cnf/configure
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
|
||||
base=${0%/*}; test -z "$base" && base=.
|
||||
|
||||
|
||||
@@ -9,18 +9,14 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
|
||||
|
||||
|
||||
SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
|
||||
https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \
|
||||
file://perl-rdepends.txt \
|
||||
file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
|
||||
file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
|
||||
file://0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch \
|
||||
file://errno_ver.diff \
|
||||
file://native-perlinc.patch \
|
||||
file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \
|
||||
file://perl-dynloader.patch \
|
||||
file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
|
||||
file://0002-Constant-Fix-up-shebang.patch \
|
||||
file://determinism.patch \
|
||||
file://determinism.patch \
|
||||
"
|
||||
SRC_URI_append_class-native = " \
|
||||
file://perl-configpm-switch.patch \
|
||||
@@ -30,13 +26,12 @@ SRC_URI_append_class-target = " \
|
||||
"
|
||||
|
||||
SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c"
|
||||
SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
|
||||
|
||||
S = "${WORKDIR}/perl-${PV}"
|
||||
|
||||
inherit upstream-version-is-even update-alternatives
|
||||
|
||||
DEPENDS += "zlib virtual/crypt"
|
||||
DEPENDS += "perlcross-native zlib virtual/crypt"
|
||||
|
||||
PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0"
|
||||
|
||||
@@ -47,12 +42,8 @@ PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm"
|
||||
# Don't generate comments in enc2xs output files. They are not reproducible
|
||||
export ENC2XS_NO_COMMENTS = "1"
|
||||
|
||||
do_unpack_append() {
|
||||
bb.build.exec_func('do_copy_perlcross', d)
|
||||
}
|
||||
|
||||
do_copy_perlcross() {
|
||||
cp -rfp ${WORKDIR}/perl-cross*/* ${S}
|
||||
do_configure_prepend() {
|
||||
cp -rfp ${STAGING_DATADIR_NATIVE}/perl-cross/* ${S}
|
||||
}
|
||||
|
||||
do_configure_class-target() {
|
||||
|
||||
Reference in New Issue
Block a user