X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/3901fa29d20db1380ae2ed8d3025c792288175d2..70035f21f3363224e42cd123619210a5ab96ade6:/packages/elfutils/build.sh

diff --git a/packages/elfutils/build.sh b/packages/elfutils/build.sh
index 4ce19850..5c5faa82 100644
--- a/packages/elfutils/build.sh
+++ b/packages/elfutils/build.sh
@@ -1,39 +1,51 @@
-TERMUX_PKG_VERSION=0.166
+TERMUX_PKG_VERSION=0.168
 TERMUX_PKG_HOMEPAGE=https://fedorahosted.org/elfutils/
 TERMUX_PKG_DESCRIPTION="ELF object file access library"
 TERMUX_PKG_SRCURL=https://fedorahosted.org/releases/e/l/elfutils/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2
 # libandroid-support for langinfo.
 TERMUX_PKG_DEPENDS="libandroid-support, liblzma, libbz2"
+TERMUX_PKG_CLANG=no
 # Use "eu-" as program prefix to avoid conflict with binutils programs.
 # This is what several linux distributions do.
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--program-prefix='eu-'"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--program-prefix='eu-'
+--disable-symbol-versioning"
 # The ar.c file is patched away for now:
 TERMUX_PKG_RM_AFTER_INSTALL="bin/eu-ar"
 
-LDFLAGS+=" -lintl"
-CFLAGS+=" -DTERMUX_EXPOSE_MEMPCPY=1 -Wno-error=unused-value -Wno-error=format-nonliteral -Wno-error"
+termux_step_pre_configure() {
+	LDFLAGS+=" -lintl"
+	CFLAGS+=" -DTERMUX_EXPOSE_MEMPCPY=1 -Wno-error=unused-value -Wno-error=format-nonliteral -Wno-error"
 
-# Exposes ACCESSPERMS in <sys/stat.h> which elfutils uses:
-CFLAGS+=" -D__USE_BSD"
+	if [ $TERMUX_ARCH = aarch64 ]; then
+		# Currently needed hack.
+		LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib"
+		LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib"
+	fi
 
-termux_step_pre_configure () {
-        # Install argp lib.
-        ARGP_FILE=$TERMUX_PKG_CACHEDIR/argp-standalone.1.3.tar.gz
-        if [ ! -f $ARGP_FILE ]; then
-                curl -o $ARGP_FILE http://www.lysator.liu.se/~nisse/archive/argp-standalone-1.3.tar.gz
-        fi
+	# Exposes ACCESSPERMS in <sys/stat.h> which elfutils uses:
+	CFLAGS+=" -D__USE_BSD"
 
-        cd $TERMUX_PKG_TMPDIR
-        tar xf $ARGP_FILE
-        cd argp-standalone-1.3
-        ./configure --host=$TERMUX_HOST_PLATFORM
-        make
+	# Install argp lib.
+	ARGP_FILE=$TERMUX_PKG_CACHEDIR/argp-standalone.1.3.tar.gz
+	if [ ! -f $ARGP_FILE ]; then
+		termux_download http://www.lysator.liu.se/~nisse/archive/argp-standalone-1.3.tar.gz \
+		                $ARGP_FILE
+	fi
 
-        cp $TERMUX_PKG_BUILDER_DIR/error.h .
-        cp $TERMUX_PKG_BUILDER_DIR/stdio_ext.h .
-        cp $TERMUX_PKG_BUILDER_DIR/obstack.h .
-        cp $TERMUX_PKG_BUILDER_DIR/qsort_r.h .
+	cd $TERMUX_PKG_TMPDIR
+	tar xf $ARGP_FILE
+	cd argp-standalone-1.3
+	ORIG_CFLAGS="$CFLAGS"
+	CFLAGS+=" -std=gnu89"
+	./configure --host=$TERMUX_HOST_PLATFORM
+	make
+	CFLAGS="$ORIG_CFLAGS"
 
-        LDFLAGS+=" -L$TERMUX_PKG_TMPDIR/argp-standalone-1.3"
-        CPPFLAGS+=" -isystem $TERMUX_PKG_TMPDIR/argp-standalone-1.3"
+	cp $TERMUX_PKG_BUILDER_DIR/error.h .
+	cp $TERMUX_PKG_BUILDER_DIR/stdio_ext.h .
+	cp $TERMUX_PKG_BUILDER_DIR/obstack.h .
+	cp $TERMUX_PKG_BUILDER_DIR/qsort_r.h .
+
+	LDFLAGS+=" -L$TERMUX_PKG_TMPDIR/argp-standalone-1.3"
+	CPPFLAGS+=" -isystem $TERMUX_PKG_TMPDIR/argp-standalone-1.3"
 }