Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0c83b67f34b4f36863e5df90597d127cfd082b67

commit 0c83b67f34b4f36863e5df90597d127cfd082b67
Author: Michel Hermier <herm...@frugalware.org>
Date:   Tue Dec 21 09:40:39 2010 +0100

gcc-4.5.2-1-i686

* Show make invocations, and use 'Fdie' instead of 'return 1'.

diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild
index e10a1e9..513276a 100644
--- a/source/devel/gcc/FrugalBuild
+++ b/source/devel/gcc/FrugalBuild
@@ -53,6 +53,7 @@ fi
if Fuse $USE_CXX; then
source=("${sour...@]}" 
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api-$pkgver.man.tar.bz2)
signatures=("${signatur...@]}" '')
+
subpkgs=("${subpk...@]}" 'libstdc++' 'gcc-g++')
subdescs=("${subdes...@]}" 'GNU Standard C++ Library' 'C++ suport for GCC')
subdepends=("${subdepen...@]}" 'libgcc' 'libstdc++')
@@ -174,16 +175,16 @@ build()
--build=$CARCH-frugalware-linux

if Fuse $USE_SHARED; then
-               make STAGE_CC_WRAPPER="$FCC" BOOT_CFLAGS="$CFLAGS" 
GCJFLAGS="$CFLAGS" bootstrap || return 1
+               Fexec make STAGE_CC_WRAPPER="$FCC" BOOT_CFLAGS="$CFLAGS" 
GCJFLAGS="$CFLAGS" bootstrap || Fdie
else
-               make all-gcc || return 1
+               Fexec make all-gcc || Fdie
fi

if Fuse $USE_SHARED; then
unset MAKEFLAGS #this is needed by libffi
Fmakeinstall
else
-               make install-gcc DESTDIR=$Fdestdir || return 1
+               Fexec make install-gcc DESTDIR=$Fdestdir || Fdie
fi

if [ -d $Fdestdir/usr/lib64 ]; then
@@ -205,7 +206,7 @@ build()
-o -name libjawt.a \
-o -name libjvm.a \
-o -name libgcj_bc.a | xargs rm -f \
-                || return 1
+                || Fdie

# conflicts with binutils
Frm /usr/bin/c++filt /usr/lib/libiberty.a
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to