SliTaz Repositories

     1.1 --- a/mingw32-gcc-c/receipt	Sat Sep 05 13:24:03 2009 +0200
     1.2 +++ b/mingw32-gcc-c/receipt	Sun Sep 26 17:02:23 2010 +0000
     1.3 @@ -12,11 +12,21 @@
     1.4  WEB_SITE="http://www.mingw.org/"
     1.5  MINGW32_URL="$SF_MIRROR/mingw"
     1.6  WGET_URL="$MINGW32_URL/$TARBALL"
     1.7 -MINGW32_TARGET="i586-pc-mingw32"
     1.8 +MINGW32_ID="i586-pc-mingw32"
     1.9 +
    1.10 +# Configuration only needs included if we're in the build/wok environment
    1.11 +if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
    1.12 +	. $WOK/mingw32-toolchain/stuff/mingw32.conf
    1.13 +fi
    1.14  
    1.15  # Rules to configure and make the package.
    1.16  compile_rules()
    1.17  {
    1.18 +	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then
    1.19 +		echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string"
    1.20 +		exit 1
    1.21 +	fi
    1.22 +
    1.23  	rm -f -r $src/binutils
    1.24  	mkdir -p $SOURCE-$VERSION-build
    1.25  	cd $SOURCE-$VERSION-build
    1.26 @@ -25,7 +35,7 @@
    1.27  		--libexecdir=/usr/lib \
    1.28  		--infodir=/usr/share/info \
    1.29  		--mandir=/usr/share/man \
    1.30 -		--with-sysroot=/usr/lib/$MINGW32_TARGET \
    1.31 +		--with-sysroot=$MINGW32_ROOT \
    1.32  		--disable-shared \
    1.33  		--disable-debug \
    1.34  		--target=$MINGW32_TARGET \
    1.35 @@ -35,7 +45,6 @@
    1.36  		--enable-sjlj-exceptions \
    1.37  		$CONFIGURE_ARGS &&
    1.38  	make CFLAGS="-O2 -fomit-frame-pointer" LDFLAGS="-s"  &&
    1.39 -	$MINGW32_TARGET-ranlib gcc/*.a &&
    1.40  	make DESTDIR=$src/_pkg install
    1.41  }
    1.42  
    1.43 @@ -55,7 +64,7 @@
    1.44  	# Archives get stripped during packaging; need to run ranlib
    1.45  	local root
    1.46  	root=$1
    1.47 -	find $root/usr/lib/gcc/$MINGW32_TARGET/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    1.48 +	find $root/usr/lib/gcc/$MINGW32_ID/ -name *.a -exec $MINGW32_ID-ranlib {} \;
    1.49  }
    1.50  
    1.51  # Rules to clean the package