SliTaz Repositories

     1.1 --- a/mingw32-gcc/receipt	Thu Sep 03 21:46:00 2009 +0200
     1.2 +++ b/mingw32-gcc/receipt	Thu Sep 17 11:53:23 2009 +0200
     1.3 @@ -13,11 +13,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  	MINGW32_DIR="$PWD"
    1.24  	MINGW32_CPP_TARBALL="$SOURCE-g++-$VERSION-src.tar.gz"
    1.25  	MINGW32_ADA_TARBALL="$SOURCE-ada-$VERSION-src.tar.gz"
    1.26 @@ -51,7 +61,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 @@ -67,9 +77,9 @@
    1.36  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.37  genpkg_rules()
    1.38  {
    1.39 -	mkdir -p $fs/usr/lib
    1.40 +	mkdir -p $fs/usr/lib $fs$MINGW32_ROOT
    1.41 +	cp -a $_pkg$MINGW32_ROOT/* $fs$MINGW32_ROOT
    1.42  	cp -a $_pkg/usr/bin $fs/usr
    1.43 -	cp -a $_pkg/usr/lib/$MINGW32_TARGET $fs/usr/lib
    1.44  	cp -a $_pkg/usr/include $fs/usr
    1.45  	# do not need to copy lib/libiberty.a
    1.46  	mkdir -p $fs/usr/lib
    1.47 @@ -82,8 +92,8 @@
    1.48  	# Archives get stripped during packaging; need to run ranlib
    1.49  	local root
    1.50  	root=$1
    1.51 -	find $root/usr/lib/gcc/$MINGW32_TARGET/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    1.52 -	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    1.53 +	find $root/usr/lib/gcc/$MINGW32_ID/ -name *.a -exec $MINGW32_ID-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