X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/651efa781e1da5914651e8c3b4c4e70f7f5a56e8..02baa030aa6273c97592f6790499f8892cb59223:/packages/perl/build.sh

diff --git a/packages/perl/build.sh b/packages/perl/build.sh
index 3326372f..bc923007 100644
--- a/packages/perl/build.sh
+++ b/packages/perl/build.sh
@@ -2,27 +2,31 @@
 TERMUX_PKG_HOMEPAGE=http://www.perl.org/
 TERMUX_PKG_DESCRIPTION="Capable, feature-rich programming language"
 # cpan modules will require make:
-TERMUX_PKG_DEPENDS="make"
-TERMUX_PKG_VERSION=5.22.1
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_VERSION=5.24.0
 TERMUX_PKG_SRCURL=http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz
 # Does not work with parallell builds:
 TERMUX_MAKE_PROCESSES=1
 TERMUX_PKG_RM_AFTER_INSTALL="bin/perl${TERMUX_PKG_VERSION}"
 TERMUX_PKG_BUILD_IN_SRC="yes"
+TERMUX_PKG_NO_DEVELSPLIT=yes
 
 termux_step_post_extract_package () {
-	PERLCROSS_VERSION=1.0.2
-	PERLCROSS_FILE=perl-${TERMUX_PKG_VERSION}-cross-${PERLCROSS_VERSION}.tar.gz
+	PERLCROSS_VERSION=1.0.3
+        PERLCROSS_PERL_VERSION=5.24.0
+	PERLCROSS_FILE=perl-${PERLCROSS_PERL_VERSION}-cross-${PERLCROSS_VERSION}.tar.gz
 	PERLCROSS_TAR=$TERMUX_PKG_CACHEDIR/$PERLCROSS_FILE
 	test ! -f $PERLCROSS_TAR && curl -o $PERLCROSS_TAR -L https://github.com/arsv/perl-cross/releases/download/$PERLCROSS_VERSION/$PERLCROSS_FILE
-	cd $TERMUX_PKG_SRCDIR
 	tar xf $PERLCROSS_TAR
-	cd perl-${TERMUX_PKG_VERSION}
+	cd perl-${PERLCROSS_PERL_VERSION}
 	cp -Rf * ../
 
 	# Remove old installation to force fresh:
 	rm -rf $TERMUX_PREFIX/lib/perl5
+
+	# Remove patch from perl-cross for file we patch ourselves:
+	rm $TERMUX_PKG_SRCDIR/cnf/diffs/liblist.patch
+	# Export variable used by Kid.pm.patch:
+	export TERMUX_PKG_SRCDIR
 }
 
 termux_step_configure () {
@@ -52,6 +56,7 @@ termux_step_configure () {
 		-Dsysroot=$TERMUX_STANDALONE_TOOLCHAIN/sysroot \
 		-Dprefix=$TERMUX_PREFIX \
 		-Dsh=$TERMUX_PREFIX/bin/sh \
+		-Duseshrplib \
 		-A ccflags="-specs=$TERMUX_SCRIPTDIR/termux.spec" \
 		-A ldflags="-specs=$TERMUX_SCRIPTDIR/termux.spec"
 }
@@ -69,4 +74,10 @@ termux_step_post_make_install () {
 	# lib/perl5/5.22.0/arm-linux/Config_heavy.pl
 	# Cleanup:
 	rm $TERMUX_PREFIX/bin/sh
+
+	cd $TERMUX_PREFIX/lib
+	ln -f -s perl5/${TERMUX_PKG_VERSION}/${TERMUX_ARCH}-linux/CORE/libperl.so libperl.so
+
+	cd $TERMUX_PREFIX/include
+	ln -f -s ../lib/perl5/${TERMUX_PKG_VERSION}/${TERMUX_ARCH}-linux/CORE perl
 }