# HG changeset patch
# User Matthew Sheets <rcx@zoominternet.net>
# Date 1248433102 0
# Node ID ca710573873892ed6d1c859a0df795bce2fbd878
# Parent  827ab3d52e8d09f7c3eb52d7e54d1a4d3abe794b
Update: gcc+gcj (added package check)

diff -r 827ab3d52e8d -r ca7105738738 gcc+gcj/receipt
--- a/gcc+gcj/receipt	Fri Jul 24 11:41:10 2009 +0200
+++ b/gcc+gcj/receipt	Fri Jul 24 10:58:22 2009 +0000
@@ -13,7 +13,7 @@
 xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXtst"
 BUILD_DEPENDS="glibc-dev gawk flex python perl gmp gmp-dev mpfr mpfr-dev \
 expat-dev zlib-dev zip unzip gtk+-dev libart_lgpl-dev xorg-dev xorg-inputproto \
-xorg-kbproto xorg-randrproto xorg-renderproto xorg-xextproto xorg-xproto"
+xorg-kbproto xorg-libXtst xorg-randrproto xorg-renderproto xorg-xextproto xorg-xproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://gcc.gnu.org/"
 WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
@@ -22,6 +22,12 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	# NOTE: gcj/libjava doesn't seem to build successfully when fastjar is installed
+	if [ -n "$(tazpkg list | grep '^fastjar\>')" ] ; then
+		echo "ERROR: Package 'fastjar' must be removed before compiling $PACKAGE"
+		exit 1
+	fi
+	
 	# Set BUILD_HOST if not defined in tazwok.conf as it should be
 	if [ -z "$BUILD_HOST" ] ; then
 		BUILD_HOST="i486-pc-linux-gnu"