From 59cd15a1e4e8923131b4091dd8ede4d341d76c09 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 26 May 2013 06:27:16 +0200 Subject: [PATCH] chroot-binutils: don't use sysroot in cross builds, only use it to build. --- srcpkgs/chroot-binutils/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/chroot-binutils/template b/srcpkgs/chroot-binutils/template index 4bc0e56fe3c..b7972168118 100644 --- a/srcpkgs/chroot-binutils/template +++ b/srcpkgs/chroot-binutils/template @@ -1,7 +1,7 @@ # Template file for 'chroot-binutils' pkgname=chroot-binutils version=2.23.52.0.2 -revision=1 +revision=2 wrksrc="binutils-${version}" short_desc="GNU binary utilities -- for xbps-src use" maintainer="Juan RP " @@ -20,8 +20,12 @@ do_configure() { if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then CONFIGFLAG="--enable-64-bit-bfd --enable-multilib" fi - - ./configure ${CONFIGURE_SHARED_ARGS} --disable-shared \ + if [ "$CROSS_BUILD" ]; then + # Do not use CONFIGURE_SHARED_ARGS nor build_style=gnu-configure, + # avoiding --with-sysroot to $XBPS_CROSS_BASE. + CONFIGFLAG="--host=$XBPS_CROSS_TRIPLET --with-build-sysroot=$XBPS_CROSS_BASE" + fi + ./configure --prefix=/usr --disable-shared \ --enable-threads --disable-plugins \ --with-mmap --disable-bootstrap ${CONFIGFLAG} }