From 38ebbf388b8eec732e4d83e453bf3006ff1593e5 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 20 Mar 2018 23:15:46 +0100 Subject: [PATCH] binutils: Fix merge issue --- packages/binutils/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh index 37ed753b3..62fffc995 100755 --- a/packages/binutils/build.sh +++ b/packages/binutils/build.sh @@ -1,14 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/binutils/ TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the GNU linker, and as, the GNU assembler" TERMUX_PKG_VERSION=2.30 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gold --enable-plugins --disable-werror --with-system-zlib --enable-new-dtags" TERMUX_PKG_SHA256=8c3850195d1c093d290a716e20ebcaa72eda32abf5e3d8611154b39cff79e9ea TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX" TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/windmc.1 share/man/man1/windres.1 bin/ld.bfd" -TERMUX_PKG_REVISION=1 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true + # Avoid linking against libfl.so from flex if available: export LEXLIB=