X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/84a0ee4ca5a2c1e06229a6892f5894ea9f52f34b..8f93f1013fe10401a5a9bb51b3840003119174dd:/packages/perl/build.sh

diff --git a/packages/perl/build.sh b/packages/perl/build.sh
index c47f06d1..5829efa9 100644
--- a/packages/perl/build.sh
+++ b/packages/perl/build.sh
@@ -1,24 +1,23 @@
 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.1
+TERMUX_PKG_REVISION=2
 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_PKG_BUILD_IN_SRC="yes"
 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 () {
 	# This port uses perl-cross: http://arsv.github.io/perl-cross/
-	local PERLCROSS_VERSION=1.1.3
+	local PERLCROSS_VERSION=1.1.4
 	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
+		                c840a327d5464ca271cac40d52e2d199330875527bf1003c28a6e550fb7bcc57
 	fi
 	tar xf $PERLCROSS_TAR
 	cd perl-cross-${PERLCROSS_VERSION}
@@ -77,4 +76,9 @@ termux_step_post_make_install () {
 
 	cd $TERMUX_PREFIX/include
 	ln -f -s ../lib/perl5/${TERMUX_PKG_VERSION}/${TERMUX_ARCH}-android/CORE perl
+	cd ../lib/perl5/${TERMUX_PKG_VERSION}/${TERMUX_ARCH}-android/
+	chmod +w Config_heavy.pl
+	sed 's',"--sysroot=$TERMUX_STANDALONE_TOOLCHAIN"/sysroot,"-I/data/data/com.termux/files/usr/include",'g' Config_heavy.pl > Config_heavy.pl.new
+	sed 's',"$TERMUX_STANDALONE_TOOLCHAIN"/sysroot,"-I/data/data/com.termux/files",'g' Config_heavy.pl.new > Config_heavy.pl
+	rm Config_heavy.pl.new
 }