wok diff binutils/receipt @ rev 16180

merge
author Christophe Lincoln <pankso@slitaz.org>
date Sun Mar 30 17:46:41 2014 +0200 (2014-03-30)
parents 380ffe05937a
children ce5ca5c37e4e
line diff
     1.1 --- a/binutils/receipt	Sat Aug 10 17:00:38 2013 +0000
     1.2 +++ b/binutils/receipt	Sun Mar 30 17:46:41 2014 +0200
     1.3 @@ -12,59 +12,29 @@
     1.4  #WGET_URL="http://www.kernel.org/pub/linux/devel/binutils/$TARBALL"
     1.5  PROVIDE="libbfd"
     1.6  TAGS="assembler linker"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  DEPENDS="glibc zlib"
    1.10  BUILD_DEPENDS="glibc-dev zlib-dev"
    1.11  
    1.12 -# Rules to compile & install the temporary toolchain.
    1.13 -precook_tmp_toolchain()
    1.14 -{
    1.15 -	mkdir -p binutils-build && cd binutils-build
    1.16 -	{ $src/configure \
    1.17 -		--target=$HOST_SYSTEM --disable-nls \
    1.18 -		--disable-werror &&
    1.19 -	make
    1.20 -	 } || return 1
    1.21 -
    1.22 -	#If building on x86_64, create a symlink to ensure the sanity of the toolchain.
    1.23 -	[ "$ARCH" = x86_64 ] && mkdir /tools/lib && ln -s lib /tools/lib64
    1.24 -
    1.25 -	make install
    1.26 -}
    1.27 -
    1.28 -cook_tmp_toolchain()
    1.29 -{
    1.30 -	mkdir -p binutils-build && cd binutils-build
    1.31 -	{ CC="$HOST_SYSTEM-gcc -B/tools/lib/" \
    1.32 -		AR=$HOST_SYSTEM-ar RANLIB=$HOST_SYSTEM-ranlib \
    1.33 -		$src/configure $CONFIGURE_ARGS \
    1.34 -		--disable-nls --with-lib-path=/tools/lib &&
    1.35 -	make &&
    1.36 -	make install &&
    1.37 -	make -C ld clean &&
    1.38 -	make -C ld LIB_PATH=/usr/lib:/lib
    1.39 -	} || return 1
    1.40 -	cp ld/ld-new /tools/bin
    1.41 -}
    1.42 +# Handle cross compilation.
    1.43 +case "$ARCH" in
    1.44 +	arm) BUILD_DEPENDS="" ;;
    1.45 +esac
    1.46  
    1.47  # Rules to configure and make the package.
    1.48  compile_rules()
    1.49  {
    1.50 -	cd $src
    1.51 -
    1.52 -	# Handle ARCH type
    1.53 -	case $ARCH in
    1.54 -		i?86)
    1.55 -			EXTRA_ARGS="--disable-werror" ;;
    1.56 +	case "$ARCH" in
    1.57 +		i?86) ARCH_ARGS="--disable-werror" ;;
    1.58  	esac
    1.59 -
    1.60  	mkdir -p ../binutils-build && cd ../binutils-build
    1.61  	$src/configure \
    1.62  		--program-prefix=$TOOLPREFIX \
    1.63  		--enable-shared \
    1.64  		--disable-initfini-array \
    1.65  		--with-bugurl="http://bugs.slitaz.org/" \
    1.66 -		$CONFIGURE_ARGS $EXTRA_ARGS &&
    1.67 +		$CONFIGURE_ARGS $ARCH_ARGS &&
    1.68  	make tooldir=/usr &&
    1.69  	make tooldir=/usr install &&
    1.70  	# This is the default binutils, so create symlinks to the target platform