X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/508fa73cb8ff2a01a37c7082905c991937549e24..4d1b187cf3f44c89ddf90101188bfde0d052440c:/packages/perl/build.sh

diff --git a/packages/perl/build.sh b/packages/perl/build.sh
index bc923007..c47f06d1 100644
--- a/packages/perl/build.sh
+++ b/packages/perl/build.sh
@@ -1,9 +1,9 @@
-# This port uses perl-cross: http://arsv.github.io/perl-cross/index.html
-TERMUX_PKG_HOMEPAGE=http://www.perl.org/
+TERMUX_PKG_HOMEPAGE=https://www.perl.org/
 TERMUX_PKG_DESCRIPTION="Capable, feature-rich programming language"
 # cpan modules will require make:
-TERMUX_PKG_VERSION=5.24.0
+TERMUX_PKG_VERSION=5.24.1
 TERMUX_PKG_SRCURL=http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=e6c185c9b09bdb3f1b13f678999050c639859a7ef39c8cad418448075f5918af
 # Does not work with parallell builds:
 TERMUX_MAKE_PROCESSES=1
 TERMUX_PKG_RM_AFTER_INSTALL="bin/perl${TERMUX_PKG_VERSION}"
@@ -11,26 +11,28 @@ TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 
 termux_step_post_extract_package () {
-	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
+	# This port uses perl-cross: http://arsv.github.io/perl-cross/
+	local PERLCROSS_VERSION=1.1.3
+	local PERLCROSS_FILE=perl-cross-${PERLCROSS_VERSION}.tar.gz
+	local PERLCROSS_TAR=$TERMUX_PKG_CACHEDIR/$PERLCROSS_FILE
+	if [ ! -f $PERLCROSS_TAR ]; then
+		termux_download https://github.com/arsv/perl-cross/releases/download/$PERLCROSS_VERSION/$PERLCROSS_FILE \
+		                $PERLCROSS_TAR \
+		                181b24ff71815fb2c8065e6ea139d106796eee0964aebfd8081f0b7f69e0696d
+	fi
 	tar xf $PERLCROSS_TAR
-	cd perl-${PERLCROSS_PERL_VERSION}
+	cd perl-cross-${PERLCROSS_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 () {
-        export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
+	export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
 
 	ORIG_AR=$AR; unset AR
 	ORIG_AS=$AS; unset AS
@@ -56,9 +58,8 @@ 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"
+		-Dcc=$ORIG_CC \
+		-Duseshrplib
 }
 
 termux_step_post_make_install () {
@@ -68,16 +69,12 @@ termux_step_post_make_install () {
 	ln -s perlthanks.1 perlbug.1
 	ln -s pstruct.1 c2ph.1
 
-	# Fix reference to termux.spec used only when cross compiling:
-	perl -p -i -e 's@-specs=/home/fornwall/dc/termux.spec@@g' $TERMUX_PREFIX/lib/perl5/*/*-linux/Config_heavy.pl
-
-	# 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
+	ln -f -s perl5/${TERMUX_PKG_VERSION}/${TERMUX_ARCH}-android/CORE/libperl.so libperl.so
 
 	cd $TERMUX_PREFIX/include
-	ln -f -s ../lib/perl5/${TERMUX_PKG_VERSION}/${TERMUX_ARCH}-linux/CORE perl
+	ln -f -s ../lib/perl5/${TERMUX_PKG_VERSION}/${TERMUX_ARCH}-android/CORE perl
 }