libelf: Update from 0.173 to 0.174

packages/libelf/build.sh

@@ -2,23 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://sourceware.org/elfutils/
 TERMUX_PKG_DESCRIPTION="ELF object file access library"
 # NOTE: We only build the libelf part of elfutils for now,
 # as other parts are not clang compatible.
-TERMUX_PKG_VERSION=(0.173
-		    1.3)
-TERMUX_PKG_SHA256=(b76d8c133f68dad46250f5c223482c8299d454a69430d9aa5c19123345a000ff
-                   dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be)
-TERMUX_PKG_SRCURL=(ftp://sourceware.org/pub/elfutils/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2
-		   http://www.lysator.liu.se/~nisse/archive/argp-standalone-${TERMUX_PKG_VERSION[1]}.tar.gz)
+TERMUX_PKG_VERSION=0.174
+TERMUX_PKG_SHA256=cdf27e70076e10a29539d89e367101d516bc4aa11b0d7777fe52139e3fcad08a
+TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/elfutils/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2
 # libandroid-support for langinfo.
 TERMUX_PKG_DEPENDS="libandroid-support"
-# Use "eu-" as program prefix to avoid conflict with binutils programs.
-# This is what several linux distributions do.
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-ac_cv_c99=yes
---program-prefix='eu-'
---disable-symbol-versioning
-"
-# The ar.c file is patched away for now:
-TERMUX_PKG_RM_AFTER_INSTALL="bin/eu-ar"
+TERMUX_PKG_BUILD_DEPENDS="argp"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_c99=yes --disable-symbol-versioning"
 TERMUX_PKG_CONFLICTS=elfutils
 TERMUX_PKG_REPLACES=elfutils
 
@@ -30,20 +20,10 @@ termux_step_pre_configure() {
 
 	CFLAGS+=" -DFNM_EXTMATCH=0"
 
-	cd argp-standalone-${TERMUX_PKG_VERSION[1]}
-	ORIG_CFLAGS="$CFLAGS"
-	CFLAGS+=" -std=gnu89"
-	./configure --host=$TERMUX_HOST_PLATFORM
-	make
-	CFLAGS="$ORIG_CFLAGS"
-
 	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_SRCDIR/argp-standalone-${TERMUX_PKG_VERSION[1]}"
-	CPPFLAGS+=" -isystem $TERMUX_PKG_SRCDIR/argp-standalone-${TERMUX_PKG_VERSION[1]}"
 }
 
 termux_step_make() {

packages/libelf/lib-color.c.patch

@@ -0,0 +1,24 @@
+diff -u -r ../elfutils-0.174/lib/color.c ./lib/color.c
+--- ../elfutils-0.174/lib/color.c	2018-09-14 10:23:36.000000000 +0000
++++ ./lib/color.c	2018-09-22 01:15:01.382883214 +0000
+@@ -40,6 +40,8 @@
+ #include "libeu.h"
+ #include "color.h"
+ 
++extern char* __progname;
++
+ /* Prototype for option handler.  */
+ static error_t parse_opt (int key, char *arg, struct argp_state *state);
+ 
+@@ -130,9 +132,9 @@
+   - 'always', 'yes', 'force'\n\
+   - 'never', 'no', 'none'\n\
+   - 'auto', 'tty', 'if-tty'\n"),
+-		     program_invocation_short_name, arg);
++		     __progname, arg);
+ 	      argp_help (&color_argp, stderr, ARGP_HELP_SEE,
+-			 program_invocation_short_name);
++			 __progname);
+ 	      exit (EXIT_FAILURE);
+ 	    }
+ 	}