wok-current rev 3758

Update: gcc+gcj (added package check)
author Matthew Sheets <rcx@zoominternet.net>
date Fri Jul 24 10:58:22 2009 +0000 (2009-07-24)
parents 827ab3d52e8d
children 2c5fb2c92a60
files gcc+gcj/receipt
line diff
     1.1 --- a/gcc+gcj/receipt	Fri Jul 24 11:41:10 2009 +0200
     1.2 +++ b/gcc+gcj/receipt	Fri Jul 24 10:58:22 2009 +0000
     1.3 @@ -13,7 +13,7 @@
     1.4  xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXtst"
     1.5  BUILD_DEPENDS="glibc-dev gawk flex python perl gmp gmp-dev mpfr mpfr-dev \
     1.6  expat-dev zlib-dev zip unzip gtk+-dev libart_lgpl-dev xorg-dev xorg-inputproto \
     1.7 -xorg-kbproto xorg-randrproto xorg-renderproto xorg-xextproto xorg-xproto"
     1.8 +xorg-kbproto xorg-libXtst xorg-randrproto xorg-renderproto xorg-xextproto xorg-xproto"
     1.9  TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.10  WEB_SITE="http://gcc.gnu.org/"
    1.11  WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
    1.12 @@ -22,6 +22,12 @@
    1.13  # Rules to configure and make the package.
    1.14  compile_rules()
    1.15  {
    1.16 +	# NOTE: gcj/libjava doesn't seem to build successfully when fastjar is installed
    1.17 +	if [ -n "$(tazpkg list | grep '^fastjar\>')" ] ; then
    1.18 +		echo "ERROR: Package 'fastjar' must be removed before compiling $PACKAGE"
    1.19 +		exit 1
    1.20 +	fi
    1.21 +	
    1.22  	# Set BUILD_HOST if not defined in tazwok.conf as it should be
    1.23  	if [ -z "$BUILD_HOST" ] ; then
    1.24  		BUILD_HOST="i486-pc-linux-gnu"