diff --git a/templates/binutils.tmpl b/templates/binutils.tmpl index fcbfa45b193..d8594ba125e 100644 --- a/templates/binutils.tmpl +++ b/templates/binutils.tmpl @@ -3,7 +3,7 @@ pkgname=binutils version=2.19 distfiles="http://ftp.gnu.org/gnu/binutils/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--disable-werror --enable-shared --disable-multilib +configure_args="--disable-werror --enable-shared --enable-multilib --enable-64-bit-bfd" make_install_target="tooldir=$XBPS_DESTDIR/$pkgname-$version/usr install prefix=$XBPS_DESTDIR/$pkgname-$version/usr" @@ -24,3 +24,13 @@ long_desc=" and other tools." base_chroot=yes + +post_install() +{ + local destdir=$XBPS_DESTDIR/$pkgname-$version + + if [ "$xbps_machine" = "x86_64" -a -d $destdir/usr/lib64 ]; then + mv $destdir/usr/lib64/* $destdir/usr/lib + rmdir $destdir/usr/lib64 + fi +}