wok diff mingw32-gcc/receipt @ rev 9285

backuppc: fix FSH
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Mar 16 10:38:51 2011 +0100 (2011-03-16)
parents 0b4cf0d9e1b5
children 4308dc535830
line diff
     1.1 --- a/mingw32-gcc/receipt	Mon Feb 14 19:09:46 2011 +0100
     1.2 +++ b/mingw32-gcc/receipt	Wed Mar 16 10:38:51 2011 +0100
     1.3 @@ -1,15 +1,18 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="mingw32-gcc"
     1.7 -SOURCE="gcc"
     1.8 +SOURCE="gcc-core"
     1.9  VERSION="3.4.5-20060117-2"
    1.10  CATEGORY="development"
    1.11  SHORT_DESC="MinGW32 gcc, for C, C++, and Ada."
    1.12  MAINTAINER="rcx@zoominternet.net"
    1.13 -DEPENDS="glibc-base mingw32-binutils mingw32-w32api-headers mingw32-runtime-headers mingw32-w32api mingw32-runtime"
    1.14 -BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils mingw32-runtime-headers mingw32-w32api-headers mingw32-gcc-c mingw32-w32api mingw32-runtime"
    1.15 +DEPENDS="glibc-base mingw32-binutils mingw32-w32api-headers \
    1.16 +mingw32-runtime-headers mingw32-w32api mingw32-runtime"
    1.17 +BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils \
    1.18 +mingw32-runtime-headers mingw32-w32api-headers mingw32-gcc-c \
    1.19 +mingw32-w32api mingw32-runtime mingw32-g++ mingw32-ada"
    1.20  PROVIDE="mingw32-gcc-c"
    1.21 -TARBALL="$SOURCE-core-$VERSION-src.tar.gz"
    1.22 +TARBALL="$SOURCE-$VERSION-src.tar.gz"
    1.23  WEB_SITE="http://www.mingw.org/"
    1.24  MINGW32_URL="$SF_MIRROR/mingw"
    1.25  WGET_URL="$MINGW32_URL/$TARBALL"
    1.26 @@ -28,34 +31,20 @@
    1.27  		return 1
    1.28  	fi
    1.29  
    1.30 -	MINGW32_DIR="$PWD"
    1.31 -	MINGW32_CPP_TARBALL="$SOURCE-g++-$VERSION-src.tar.gz"
    1.32 -	MINGW32_ADA_TARBALL="$SOURCE-ada-$VERSION-src.tar.gz"
    1.33 -	
    1.34 -	for gcc_tgz in $MINGW32_CPP_TARBALL $MINGW32_ADA_TARBALL ; do
    1.35 -		# Download the additional language tarballs
    1.36 -		if [ ! -f "$SOURCES_REPOSITORY/$gcc_tgz" ] ; then
    1.37 -			cd $SOURCES_REPOSITORY
    1.38 -			download $MINGW32_URL/$gcc_tgz
    1.39 -		fi
    1.40 -		
    1.41 -		# Extract the additional language tarballs
    1.42 -		if [ -f "$SOURCES_REPOSITORY/$gcc_tgz" ] ; then
    1.43 -			cd $MINGW32_DIR
    1.44 -			echo "Extracting $gcc_tgz ..."
    1.45 -			tar xzf "$SOURCES_REPOSITORY/$gcc_tgz"
    1.46 -		else
    1.47 -			# Exit if file not found to avoid errors.
    1.48 -			echo -e "\nDownload of $gcc_tgz failed, exiting. Please check the URL.\n"
    1.49 -			return 1
    1.50 -		fi
    1.51 +	report open-bloc
    1.52 +
    1.53 +	for s in mingw32-g++ mingw32-ada; do
    1.54 +		tazwok get-src $s --target=$PACKAGE-$VERSION && continue
    1.55 +		report close-bloc
    1.56 +		return 1
    1.57  	done
    1.58 -	
    1.59 -	cd $MINGW32_DIR
    1.60 +
    1.61 +	report step "Running compilation"
    1.62  
    1.63  	rm -f -r $src/binutils
    1.64  	mkdir -p $SOURCE-$VERSION-build
    1.65  	cd $SOURCE-$VERSION-build
    1.66 +	{
    1.67  	$src/configure \
    1.68  		--prefix=/usr \
    1.69  		--libexecdir=/usr/lib \
    1.70 @@ -71,7 +60,9 @@
    1.71  		--enable-sjlj-exceptions \
    1.72  		$CONFIGURE_ARGS &&
    1.73  	make -j 4 CFLAGS="-O2 -fomit-frame-pointer" LDFLAGS="-s"  &&
    1.74 -	make DESTDIR=$src/_pkg install
    1.75 +	make DESTDIR=$src/_pkg install &&
    1.76 +	report close-bloc
    1.77 +	} || { report close-bloc; return 1; }
    1.78  }
    1.79  
    1.80  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.81 @@ -99,5 +90,5 @@
    1.82  # Rules to clean the package
    1.83  clean_wok()
    1.84  {
    1.85 -	rm -r $SOURCE-$VERSION-build
    1.86 +	rm -rf $SOURCE-$VERSION-build
    1.87  }