X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/9a9aaa90dfb8b1e27f9812bb8fe37dbd2f82175d..7b1f1bd35dd9bd3367bf603d97be4f582f8b1b23:/packages/perl/build.sh

diff --git a/packages/perl/build.sh b/packages/perl/build.sh
index 3de2802b..4224eb07 100644
--- a/packages/perl/build.sh
+++ b/packages/perl/build.sh
@@ -1,24 +1,33 @@
 # This port uses perl-cross: http://arsv.github.io/perl-cross/index.html
 TERMUX_PKG_HOMEPAGE=http://www.perl.org/
 TERMUX_PKG_DESCRIPTION="Capable, feature-rich programming language"
-TERMUX_PKG_VERSION=5.20.2
+# cpan modules will require make:
+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=0.9.6
-	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 -L https://raw.github.com/arsv/perl-cross/releases/$PERLCROSS_FILE > $PERLCROSS_TAR
+	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 () {
@@ -36,12 +45,19 @@ termux_step_configure () {
 	ORIG_RANLIB=$RANLIB; unset RANLIB
 	ORIG_LD=$LD; unset LD
 
+	# Since we specify $TERMUX_PREFIX/bin/sh below for the shell
+	# it will be run during the build, so temporarily (removed in
+	# termux_step_post_make_install below) setup symlink:
+	rm -f $TERMUX_PREFIX/bin/sh
+	ln -s /bin/sh $TERMUX_PREFIX/bin/sh
+
 	cd $TERMUX_PKG_BUILDDIR
 	$TERMUX_PKG_SRCDIR/configure \
 		--target=$TERMUX_HOST_PLATFORM \
 		-Dsysroot=$TERMUX_STANDALONE_TOOLCHAIN/sysroot \
 		-Dprefix=$TERMUX_PREFIX \
-		-Dsh=/system/bin/sh \
+		-Dsh=$TERMUX_PREFIX/bin/sh \
+		-Duseshrplib \
 		-A ccflags="-specs=$TERMUX_SCRIPTDIR/termux.spec" \
 		-A ldflags="-specs=$TERMUX_SCRIPTDIR/termux.spec"
 }
@@ -49,8 +65,20 @@ termux_step_configure () {
 termux_step_post_make_install () {
 	# Replace hardlinks with symlinks:
 	cd $TERMUX_PREFIX/share/man/man1
-	rm {perlbug.1,s2p.1,c2ph.1}
+	rm {perlbug.1,c2ph.1}
 	ln -s perlthanks.1 perlbug.1
-	ln -s psed.1 s2p.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
+
+	cd $TERMUX_PREFIX/include
+	ln -f -s ../lib/perl5/${TERMUX_PKG_VERSION}/${TERMUX_ARCH}-linux/CORE perl
 }