groups/221.native_packages_dev.group: perl: bump to v5.36.0

Signed-off-by: Ørjan Malde <red@foxi.me>

3 files changed, 20 insertions, 33 deletions

diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index b7c51c59..6609b907 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -113,15 +113,17 @@ make_cv_synchronous_posix_spawn=yes"};
 : ${PKG_PATCHUTILS_SHA256SUM:=8875b0965fe33de62b890f6cd793be7fafe41a4e552edbf641f1fed5ebbf45ed};
 : ${PKG_PATCHUTILS_VERSION:=0.4.2};
 : ${PKG_PATCHUTILS_URL:=http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PKG_PATCHUTILS_VERSION}.tar.xz};
-: ${PKG_PERL_SHA256SUM:=2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27};
-: ${PKG_PERL_VERSION:=5.22.1};
+: ${PKG_PERL_SHA256SUM:=e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a};
+: ${PKG_PERL_VERSION:=5.36.0};
 : ${PKG_PERL_URL:=http://www.cpan.org/src/5.0/perl-${PKG_PERL_VERSION}.tar.gz};
-: ${PKG_PERL_URLS_GIT:="perl-cross=https://github.com/lalbornoz/perl-cross@master"};
+: ${PKG_PERL_URLS_GIT:="perl-cross=https://github.com/Redfoxymoon/perl-cross@master"};
 : ${PKG_PERL_BASE_DIR:=${BUILD_WORKDIR}/perl-native-${DEFAULT_TARGET}};
-: ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_NATIVE}/include --sysroot=${PREFIX_NATIVE} --target=${DEFAULT_TARGET}"};
+: ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_NATIVE}/include -Duseshrplib -Darchname=${DEFAULT_TARGET} -Darchlib=/usr/lib/perl5/${PKG_PERL_VERSION}/${DEFAULT_TARGET} -Dsitearch=/usr/lib/perl5/site_perl/${PKG_PERL_VERSION}/${DEFAULT_TARGET} --sysroot=${PREFIX_NATIVE} --target=${DEFAULT_TARGET}"};
+: ${PKG_PERL_CFLAGS_CONFIGURE_EXTRA:="-std=gnu99"};
 : ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${DEFAULT_TARGET}"};
-: ${PKG_PERL_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_PERL_MAKEFLAGS_BUILD:="-j1 PERL_ARCHIVE_AFTER=${PREFIX}/tmp/perl-native-${DEFAULT_TARGET}/perl-${PKG_PERL_VERSION}/libperl.so OTHERLDFLAGS=--sysroot=${PREFIX_NATIVE}"};
 : ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}};
+: ${PKG_PERL_IN_TREE:=1};
 : ${PKG_POSIX_CC_DEPENDS:="musl_compat"};
 : ${PKG_POSIX_CC_SHA256SUM:=bd90442d98714f874b6e7e62fa8376ddca282c2174dc582917ecab773f96c095};
 : ${PKG_POSIX_CC_VERSION:=1.4};
diff --git a/patches/perl-5.22.1.local.patch b/patches/perl-5.22.1.local.patch
deleted file mode 100644
index 2113c540..00000000
--- a/patches/perl-5.22.1.local.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru perl-5.22.1.orig/installman perl-5.22.1/installman
---- perl-5.22.1.orig/installman	2017-11-17 23:35:34.386593179 +0100
-+++ perl-5.22.1/installman	2017-11-17 23:03:41.388858972 +0100
-@@ -146,9 +146,10 @@
- 	    next;
- 	}
- 
--	if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'uwin' || $^O eq 'cygwin') {
-+	#Fix me later?
-+	#if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'uwin' || $^O eq 'cygwin' || $^O eq 'midipix') {
-             $manpage =~ s#::#.#g;
--	}
-+	#}
-         my $tmp = "${mandir}/${manpage}.tmp";
- 	$manpage = "${mandir}/${manpage}.${manext}";
- 
-diff -ru perl-5.22.1.orig/Makefile perl-5.22.1/Makefile
---- perl-5.22.1.orig/Makefile	2017-11-17 19:06:50.298908618 +0100
-+++ perl-5.22.1/Makefile	2017-11-17 23:32:21.687695934 +0100
-@@ -135,7 +135,7 @@
- perl$x: perlmain$o $(LIBPERL) $(static_tgt) static.list ext.libs
- 	$(eval extlibs=$(shell cat ext.libs))
- 	$(eval statars=$(shell cat static.list))
--	$(CC) $(LDFLAGS) -o $@ $(filter %$o,$^) $(LIBPERL) $(statars) $(LIBS) $(extlibs)
-+	$(CC) $(LDFLAGS) -o $@ $(filter %$o,$^) -L. -lperl $(statars) $(LIBS) $(extlibs)
- 
- %$o: %.c config.h
- 	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/patches/perl-5.36.0.local.patch b/patches/perl-5.36.0.local.patch
new file mode 100644
index 00000000..b56ecc69
--- /dev/null
+++ b/patches/perl-5.36.0.local.patch
@@ -0,0 +1,13 @@
+diff -ru perl-5.36.0.orig/installman perl-5.36.0/installman
+--- perl-5.36.0.orig/installman	2022-10-12 21:41:08.169953621 +0200
++++ perl-5.36.0/installman	2022-10-12 21:59:24.769494586 +0200
+@@ -152,9 +152,7 @@
+ 	    next;
+ 	}
+ 
+-	if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'cygwin') {
+             $manpage =~ s#::#.#g;
+-	}
+         my $tmp = "${mandir}/${manpage}.tmp";
+ 	$manpage = "${mandir}/${manpage}.${manext}";
+