wok rev 8504

gcc+gcj: remove build dir after packing files, don't exit but return
author Antoine Bodin <gokhlayeh@slitaz.org>
date Sat Feb 12 02:18:58 2011 +0100 (2011-02-12)
parents 5a2ca8500e9a
children 85cd798d6997
files elfutils/receipt gcc+gcj/receipt
line diff
     1.1 --- a/elfutils/receipt	Sat Feb 12 02:15:32 2011 +0100
     1.2 +++ b/elfutils/receipt	Sat Feb 12 02:18:58 2011 +0100
     1.3 @@ -5,7 +5,7 @@
     1.4  CATEGORY="development"
     1.5  SHORT_DESC="ELF object file access library."
     1.6  MAINTAINER="pascal.bellard@slitaz.org"
     1.7 -DEPENDS="glibc-base"
     1.8 +DEPENDS="glibc-base elfutils"
     1.9  BUILD_DEPENDS="binutils"
    1.10  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.11  WEB_SITE="https://fedorahosted.org/elfutils/"
     2.1 --- a/gcc+gcj/receipt	Sat Feb 12 02:15:32 2011 +0100
     2.2 +++ b/gcc+gcj/receipt	Sat Feb 12 02:18:58 2011 +0100
     2.3 @@ -41,7 +41,7 @@
     2.4  		# Exit if download failed to avoid errors.
     2.5  		if [ ! -f "$SOURCES_REPOSITORY/$ECJ_JAR" ] ; then
     2.6  			echo -e "\nECJ jar download failed, exiting. Please check ECJ_URL variable.\n"
     2.7 -			exit 1
     2.8 +			return 1
     2.9  		fi
    2.10  	else
    2.11  		echo -n "ECJ jar exit... "
    2.12 @@ -58,12 +58,12 @@
    2.13  
    2.14  	# Use libiberty.a from binutils.
    2.15  	sed -i 's/install_to_$(INSTALL_DEST) //' \
    2.16 -		$SOURCE-$VERSION/libiberty/Makefile.in || exit 1
    2.17 +		$src/libiberty/Makefile.in || return 1
    2.18      mkdir -p $SOURCE-$VERSION-build
    2.19      cd $SOURCE-$VERSION-build
    2.20  	
    2.21      PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
    2.22 -    ../$SOURCE-$VERSION/configure --prefix=/usr --libexecdir=/usr/lib \
    2.23 +    ../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \
    2.24  		--infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \
    2.25  		--enable-languages=c,c++,objc,java --enable-shared \
    2.26  		--with-system-zlib \
    2.27 @@ -77,10 +77,10 @@
    2.28  		--enable-gtk-cairo \
    2.29  		--enable-lto \
    2.30  		$CONFIGURE_ARGS  $GCC_TARGET  &&
    2.31 -    make -j 4 bootstrap &&
    2.32 +    make bootstrap &&
    2.33      # Make install in the source tree to help creating derived pkgs
    2.34      # and keep $_pkg variable set for genpkg.
    2.35 -    make -j 4 DESTDIR=$src/_pkg install
    2.36 +    make install
    2.37  }
    2.38  
    2.39  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.40 @@ -97,6 +97,7 @@
    2.41      rm $fs/usr/lib/libgomp.so*
    2.42      # Include files.
    2.43      cp -a $_pkg/usr/include $fs/usr
    2.44 +    rm -r $WOK/$PACKAGE/$SOURCE-$VERSION-build
    2.45  }
    2.46  
    2.47  # Post install commands for Tazpkg.
    2.48 @@ -113,10 +114,4 @@
    2.49  	fi
    2.50  }
    2.51  
    2.52 -# Rules to clean the package
    2.53 -clean_wok()
    2.54 -{
    2.55 -	rm -r $SOURCE-$VERSION-build
    2.56 -}
    2.57 -
    2.58  TAZBB_NO_INSTALL="because it does not support objc and gfortran (yet)"