wok diff gcc/receipt @ rev 10340

shared-mime-info: Add $CONFIGURE_ARGS.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun May 22 02:24:27 2011 +0000 (2011-05-22)
parents 5a24b1cc7c00
children e2da6d423e51
line diff
     1.1 --- a/gcc/receipt	Fri May 20 01:50:57 2011 +0200
     1.2 +++ b/gcc/receipt	Sun May 22 02:24:27 2011 +0000
     1.3 @@ -91,8 +91,6 @@
     1.4  
     1.5  	{ CC="$BUILD_HOST-gcc -B/tools/lib/" \
     1.6  		AR=$BUILD_HOST-ar RANLIB=$BUILD_HOST-ranlib \
     1.7 -		# --disable-bootstrap dont exist ???
     1.8 -		# See: ./configure --help | grep bootstrap
     1.9  		$src/configure \
    1.10  		--with-local-prefix=/tools --enable-clocale=gnu \
    1.11  		--enable-shared --enable-threads=posix \
    1.12 @@ -122,7 +120,9 @@
    1.13  	sed -i 's/install_to_$(INSTALL_DEST) //' \
    1.14  		libiberty/Makefile.in || return 1
    1.15  	mkdir -p ../gcc-build && cd ../gcc-build
    1.16 -	
    1.17 +
    1.18 +	# This is the default GCC and we want a native build to cross compile after.
    1.19 +	# SliTaz target i486 host so we need a native i486 build for GCC.
    1.20  	case "$opt" in
    1.21  		--first-pass)
    1.22  			# Used by slitaz-toolchain when rebuilding the full toolchain.
    1.23 @@ -132,15 +132,16 @@
    1.24  				--disable-nls \
    1.25  				--enable-shared \
    1.26  				--enable-languages=c,c++ \
    1.27 -				--disable-multilib \
    1.28  				--disable-libstdcxx-pch \
    1.29  				--enable-__cxa_atexit \
    1.30  				--enable-clocale=gnu \
    1.31  				--enable-threads=posix \
    1.32 -				$CONFIGURE_ARGS &&
    1.33 +				--disable-bootstrap \
    1.34 +				--build=$HOST_SYSTEM \
    1.35 +				--host=$HOST_SYSTEM &&
    1.36  			make && make install ;;
    1.37  		*)
    1.38 -			# Used by default to produce a full featured GCC compiler.
    1.39 +			# Used by default to produce a full featured X86 GCC compiler.
    1.40  			echo "cook: configure GCC for: final/full build"
    1.41  			$src/configure \
    1.42  				--libexecdir=/usr/lib \
    1.43 @@ -153,8 +154,11 @@
    1.44  				--enable-__cxa_atexit \
    1.45  				--enable-lto \
    1.46  				--enable-threads=posix \
    1.47 +				--disable-bootstrap \
    1.48 +				--with-pkgversion="SliTaz" \
    1.49  				--with-tune=$ARCH \
    1.50 -				$CONFIGURE_ARGS &&
    1.51 +				--build=$HOST_SYSTEM \
    1.52 +				--host=$HOST_SYSTEM &&
    1.53  			make && make install ;;
    1.54  	esac
    1.55  }
    1.56 @@ -166,7 +170,7 @@
    1.57  	cp -a $_pkg/usr/bin $fs/usr
    1.58  	
    1.59  	# Copy all libs. Remove libgcc_s.so and libstdc++.so they goes in
    1.60 -	# the gcc-lib-base-$VERSION package.
    1.61 +	# the gcc-lib-base package.
    1.62  	cp -a $_pkg/usr/lib $fs/usr
    1.63  	rm -f $fs/usr/lib/libgcc_s.so*
    1.64  	rm -f $fs/usr/lib/libstdc++.so*
    1.65 @@ -176,7 +180,7 @@
    1.66  	# Include files.
    1.67  	cp -a $_pkg/usr/include $fs/usr
    1.68  	
    1.69 -	# Gfortran goes in gfortran-$VERSION package.
    1.70 +	# Gfortran goes in gfortran package.
    1.71  	rm -f $fs/usr/bin/*gfortran
    1.72  	rm -f $fs/usr/lib/libgfortran*
    1.73  	rm -f $fs/usr/lib/gcc/*/$VERSION/libgfortran*