SliTaz Repositories

     1.1 --- a/mingw32-runtime/receipt	Thu Sep 03 21:46:00 2009 +0200
     1.2 +++ b/mingw32-runtime/receipt	Wed Jun 23 12:21:19 2010 +0200
     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 @@ -30,17 +35,16 @@
    1.28  		--prefix=$src/_pkg/usr \
    1.29  		--host=$MINGW32_TARGET \
    1.30  		--build=$BUILD_HOST &&
    1.31 -	make CFLAGS="-O2 -mms-bitfields -march=${TARGET_CPU-i386} -I/usr/$MINGW32_TARGET/include" LDFLAGS="-s" &&
    1.32 +	make CFLAGS="-O2 -mms-bitfields -march=${TARGET_CPU-i386} -I$MINGW32_ROOT/include" LDFLAGS="-s" &&
    1.33  	make DESTDIR=$src/_pkg install
    1.34  }
    1.35  
    1.36  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.37  genpkg_rules()
    1.38  {
    1.39 -	mkdir -p $fs/usr/lib/$MINGW32_TARGET
    1.40 -	cp -a $_pkg/usr/bin $fs/usr/lib/$MINGW32_TARGET
    1.41 -	cp -a $_pkg/usr/include $fs/usr/lib/$MINGW32_TARGET
    1.42 -	cp -a $_pkg/usr/lib $fs/usr/lib/$MINGW32_TARGET
    1.43 +	mkdir -p $fs$MINGW32_ROOT
    1.44 +	cp -a $_pkg/usr/bin $fs$MINGW32_ROOT
    1.45 +	cp -a $_pkg/usr/lib $fs$MINGW32_ROOT
    1.46  }
    1.47  
    1.48  # Rules to setup after installation
    1.49 @@ -49,7 +53,7 @@
    1.50  	# Archives get stripped during packaging; need to run ranlib
    1.51  	local root
    1.52  	root=$1
    1.53 -	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    1.54 +	find $root/usr/$MINGW32_ID/lib/ -name *.a -exec $MINGW32_ID-ranlib {} \;
    1.55  }
    1.56  
    1.57  # Rules to clean the package