X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/11e97371dbd79a5b541c5ff8d4afde93976c2f5f..7ffcc6a9bc34cadb71fc4c336e0a40c65e2f3abf:/packages/erlang/build.sh

diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh
index e16da0ce..89362725 100755
--- a/packages/erlang/build.sh
+++ b/packages/erlang/build.sh
@@ -1,25 +1,30 @@
-TERMUX_PKG_HOMEPAGE="https://www.erlang.org/"
+TERMUX_PKG_HOMEPAGE=https://www.erlang.org/
 TERMUX_PKG_DESCRIPTION="General-purpose concurrent functional programming language developed by Ericsson"
-TERMUX_PKG_VERSION="19.2"
+TERMUX_PKG_VERSION=20.1.6
+TERMUX_PKG_SHA256=21358072bc7052639b0af33d726e5d38cd4d2bb92581ceb227a347282482476a
+TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="openssl, ncurses, libutil"
-TERMUX_PKG_SRCURL="http://erlang.org/download/otp_src_${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=a016b3ef5dac1e532972617b2715ef187ecb616f7cd7ddcfe0f1d502f5d24870
-TERMUX_PKG_FOLDERNAME="otp_src_$TERMUX_PKG_VERSION"
 TERMUX_PKG_HOSTBUILD="yes"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap"
 TERMUX_PKG_EXTRA_MAKE_ARGS="noboot"
 
+termux_step_post_extract_package() {
+	# We need a host build every time:
+	rm -Rf "$TERMUX_PKG_HOSTBUILD_DIR"
+	./otp_build autoconf
+}
+
 termux_step_host_build () {
 	cd $TERMUX_PKG_SRCDIR
 	./configure --enable-bootstrap-only
 	make -j "$TERMUX_MAKE_PROCESSES"
-	cp "${TERMUX_PKG_SRCDIR}"/bin/*/* "$TERMUX_PKG_HOSTBUILD_DIR"
 }
 
 termux_step_pre_configure () {
 	# liblog is needed for syslog usage:
 	LDFLAGS+=" -llog"
 	# Put binaries built in termux_step_host_build at start of PATH:
-	export PATH="$TERMUX_PKG_HOSTBUILD_DIR:$PATH"
+	cp bin/*/* $TERMUX_PKG_SRCDIR/bootstrap/bin
+	export PATH="$TERMUX_PKG_SRCDIR/bootstrap/bin:$PATH"
 }