wok diff mingw32-w32api/receipt @ rev 6693

Added 2 patches to make. Patches came from archlinux.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Oct 13 01:41:55 2010 +0000 (2010-10-13)
parents 05b5a901936b
children 0b4cf0d9e1b5
line diff
     1.1 --- a/mingw32-w32api/receipt	Thu Sep 03 21:46:00 2009 +0200
     1.2 +++ b/mingw32-w32api/receipt	Wed Oct 13 01:41:55 2010 +0000
     1.3 @@ -11,14 +11,19 @@
     1.4  TARBALL="$SOURCE-$VERSION-src.tar.gz"
     1.5  WEB_SITE="http://www.mingw.org/"
     1.6  WGET_URL="$SF_MIRROR/mingw/$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 -	# Set a default value for BUILD_HOST if it is not defined in tazwok.conf as it should be
    1.19 -	if [ -z "$BUILD_HOST" ] ; then
    1.20 -		BUILD_HOST=i486-pc-linux-gnu
    1.21 +	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then
    1.22 +		echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string"
    1.23 +		exit 1
    1.24  	fi
    1.25  
    1.26  	rm -f -r $src/binutils
    1.27 @@ -37,8 +42,8 @@
    1.28  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.29  genpkg_rules()
    1.30  {
    1.31 -	mkdir -p $fs/usr/lib/$MINGW32_TARGET
    1.32 -	cp -a $_pkg/usr/lib $fs/usr/lib/$MINGW32_TARGET
    1.33 +	mkdir -p $fs$MINGW32_ROOT
    1.34 +	cp -a $_pkg/usr/lib $fs$MINGW32_ROOT
    1.35  }
    1.36  
    1.37  # Rules to setup after installation
    1.38 @@ -47,7 +52,7 @@
    1.39  	# Archives get stripped during packaging; need to run ranlib
    1.40  	local root
    1.41  	root=$1
    1.42 -	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    1.43 +	find $root/usr/$MINGW32_ID/lib/ -name *.a -exec $MINGW32_ID-ranlib {} \;
    1.44  }
    1.45  
    1.46  # Rules to clean the package