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

diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh
index 0c8a69f9..89362725 100755
--- a/packages/erlang/build.sh
+++ b/packages/erlang/build.sh
@@ -1,34 +1,30 @@
-TERMUX_PKG_HOMEPAGE="http://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="18.3.3"
-TERMUX_PKG_DEPENDS="openssl, ncurses"
-
-TERMUX_PKG_SRCURL="https://github.com/erlang/otp/archive/OTP-${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_FOLDERNAME="otp-OTP-${TERMUX_PKG_VERSION}"
-
+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_HOSTBUILD="yes"
 TERMUX_PKG_BUILD_IN_SRC="yes"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_TOPDIR}/openssl/src --with-termcap"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap"
+TERMUX_PKG_EXTRA_MAKE_ARGS="noboot"
 
-termux_step_post_extract_package () {
-    rm -Rf "$TERMUX_PKG_HOSTBUILD_DIR"
-    export ERL_TOP="$TERMUX_PKG_SRCDIR"
-    cd "$ERL_TOP"
-    ./otp_build autoconf
+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 $ERL_TOP
-    ./configure --enable-bootstrap-only
-    make -j "$TERMUX_MAKE_PROCESSES"
+	cd $TERMUX_PKG_SRCDIR
+	./configure --enable-bootstrap-only
+	make -j "$TERMUX_MAKE_PROCESSES"
 }
 
 termux_step_pre_configure () {
-    LDFLAGS+=" -llog -L${TERMUX_TOPDIR}/openssl/src"
-}
-
-termux_step_make () {
-    cp "${TERMUX_PKG_SRCDIR}/bin/x86_64-unknown-linux-gnu/"* "${TERMUX_PKG_SRCDIR}/bootstrap/bin"
-    PATH+=":${TERMUX_PKG_SRCDIR}/bootstrap/bin"
-    make -j $TERMUX_MAKE_PROCESSES noboot
+	# liblog is needed for syslog usage:
+	LDFLAGS+=" -llog"
+	# Put binaries built in termux_step_host_build at start of PATH:
+	cp bin/*/* $TERMUX_PKG_SRCDIR/bootstrap/bin
+	export PATH="$TERMUX_PKG_SRCDIR/bootstrap/bin:$PATH"
 }