binutils: enable 64-bit bfd and x86_64 targets on i686 always

This is apparently necessary to build grub on i686 starting with
binutils 2.30.

Closes: #11953 [via git-merge-pr]
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
q66 2019-05-21 21:38:32 +02:00 committed by Jürgen Buchmüller
parent 8f95cf4c22
commit 1dcd80236d
No known key found for this signature in database
GPG key ID: DE55AD8DBEBB4EE8

View file

@ -1,7 +1,7 @@
# Template file for 'binutils' # Template file for 'binutils'
pkgname=binutils pkgname=binutils
version=2.32 version=2.32
revision=1 revision=2
bootstrap=yes bootstrap=yes
short_desc="GNU binary utilities" short_desc="GNU binary utilities"
maintainer="Juan RP <xtraeme@voidlinux.org>" maintainer="Juan RP <xtraeme@voidlinux.org>"
@ -33,6 +33,8 @@ do_configure() {
fi fi
if [ "${XBPS_TARGET_MACHINE%-musl}" = "x86_64" ]; then if [ "${XBPS_TARGET_MACHINE%-musl}" = "x86_64" ]; then
CONFIGFLAG+=" --enable-targets=x86_64-pep" CONFIGFLAG+=" --enable-targets=x86_64-pep"
elif [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
CONFIGFLAG+=" --enable-64-bit-bfd --enable-targets=x86_64-linux-gnu,x86_64-pep"
fi fi
./configure --build=$XBPS_TRIPLET --prefix=/usr --enable-threads \ ./configure --build=$XBPS_TRIPLET --prefix=/usr --enable-threads \
--enable-plugins --enable-secureplt --with-mmap \ --enable-plugins --enable-secureplt --with-mmap \