wok-next diff gcc+gcj/receipt @ rev 8655
Merge
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Wed Feb 16 05:02:47 2011 +0100 (2011-02-16) |
parents | 2d6d7969ffcd |
children | 129bb5b11a7e |
line diff
1.1 --- a/gcc+gcj/receipt Sat Feb 05 00:39:11 2011 +0000 1.2 +++ b/gcc+gcj/receipt Wed Feb 16 05:02:47 2011 +0100 1.3 @@ -41,7 +41,7 @@ 1.4 # Exit if download failed to avoid errors. 1.5 if [ ! -f "$SOURCES_REPOSITORY/$ECJ_JAR" ] ; then 1.6 echo -e "\nECJ jar download failed, exiting. Please check ECJ_URL variable.\n" 1.7 - exit 1 1.8 + return 1 1.9 fi 1.10 else 1.11 echo -n "ECJ jar exit... " 1.12 @@ -58,12 +58,12 @@ 1.13 1.14 # Use libiberty.a from binutils. 1.15 sed -i 's/install_to_$(INSTALL_DEST) //' \ 1.16 - $SOURCE-$VERSION/libiberty/Makefile.in || exit 1 1.17 + $src/libiberty/Makefile.in || return 1 1.18 mkdir -p $SOURCE-$VERSION-build 1.19 cd $SOURCE-$VERSION-build 1.20 1.21 PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 1.22 - ../$SOURCE-$VERSION/configure --prefix=/usr --libexecdir=/usr/lib \ 1.23 + ../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \ 1.24 --infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \ 1.25 --enable-languages=c,c++,objc,java --enable-shared \ 1.26 --with-system-zlib \ 1.27 @@ -77,10 +77,10 @@ 1.28 --enable-gtk-cairo \ 1.29 --enable-lto \ 1.30 $CONFIGURE_ARGS $GCC_TARGET && 1.31 - make -j 4 bootstrap && 1.32 + make bootstrap && 1.33 # Make install in the source tree to help creating derived pkgs 1.34 # and keep $_pkg variable set for genpkg. 1.35 - make -j 4 DESTDIR=$src/_pkg install 1.36 + make install 1.37 } 1.38 1.39 # Rules to gen a SliTaz package suitable for Tazpkg. 1.40 @@ -97,6 +97,7 @@ 1.41 rm $fs/usr/lib/libgomp.so* 1.42 # Include files. 1.43 cp -a $_pkg/usr/include $fs/usr 1.44 + rm -r $WOK/$PACKAGE/$SOURCE-$VERSION-build 1.45 } 1.46 1.47 # Post install commands for Tazpkg. 1.48 @@ -113,10 +114,4 @@ 1.49 fi 1.50 } 1.51 1.52 -# Rules to clean the package 1.53 -clean_wok() 1.54 -{ 1.55 - rm -r $SOURCE-$VERSION-build 1.56 -} 1.57 - 1.58 TAZBB_NO_INSTALL="because it does not support objc and gfortran (yet)"