wok-next diff mingw32-gcc/receipt @ rev 21020

Cleaning is almost finished... I should proceed to upgrades.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Nov 02 14:15:08 2018 +0200 (2018-11-02)
parents b7e296230dd7
children aa1e58c82d61
line diff
     1.1 --- a/mingw32-gcc/receipt	Sat Jun 23 13:59:48 2018 +0300
     1.2 +++ b/mingw32-gcc/receipt	Fri Nov 02 14:15:08 2018 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  VERSION="3.4.5-20060117-2"
     1.5  CATEGORY="development"
     1.6  SHORT_DESC="MinGW32 gcc, for C, C++, and Ada"
     1.7 -MAINTAINER="rcx@zoominternet.net"
     1.8 +MAINTAINER="devel@slitaz.org"
     1.9  LICENSE="GPL2"
    1.10  WEB_SITE="http://www.mingw.org/"
    1.11  
    1.12 @@ -24,12 +24,12 @@
    1.13  	echo "CFLAGS=CXXFLAGS='$CFLAGS'"
    1.14  
    1.15  	# Configuration only needs included if we're in the build/wok environment
    1.16 -	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
    1.17 +	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
    1.18  		.   $WOK/mingw32-toolchain/stuff/mingw32.conf
    1.19  	fi
    1.20  
    1.21 -	mkdir -p $DESTDIR/usr/share/man/man1 $DESTDIR/usr/share/man/man7 
    1.22 -	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then
    1.23 +	mkdir -p $install/usr/share/man/man1 $install/usr/share/man/man7 
    1.24 +	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ]; then
    1.25  		echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string"
    1.26  		return 1
    1.27  	fi
    1.28 @@ -61,17 +61,15 @@
    1.29  		--disable-win32-registry \
    1.30  		--enable-sjlj-exceptions \
    1.31  		$CONFIGURE_ARGS &&
    1.32 -	make -j4 \
    1.33 +	make \
    1.34  		CFLAGS="-O2 -fomit-frame-pointer" \
    1.35  		LDFLAGS="-s" &&
    1.36 -	make \
    1.37 -		DESTDIR=$DESTDIR \
    1.38 -		install 2>&1 | grep -v fixinc/fixincl
    1.39 +	make DESTDIR=$install install
    1.40  }
    1.41  
    1.42  genpkg_rules() {
    1.43  	# Configuration only needs included if we're in the build/wok environment
    1.44 -	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
    1.45 +	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
    1.46  		.   $WOK/mingw32-toolchain/stuff/mingw32.conf
    1.47  	fi
    1.48  
    1.49 @@ -95,7 +93,3 @@
    1.50  	chroot "$1/" find "/usr/lib/gcc/$MINGW32_ID/" -name *.a -exec $MINGW32_ID-ranlib {} \;
    1.51  	chroot "$1/" find "/usr/$MINGW32_ID/lib/"     -name *.a -exec $MINGW32_ID-ranlib {} \;
    1.52  }
    1.53 -
    1.54 -clean_wok() {
    1.55 -	rm -rf gcc-core-$VERSION-build
    1.56 -}