# HG changeset patch
# User Matthew Sheets <rcx@zoominternet.net>
# Date 1248960319 0
# Node ID 7fe791e8b986f1b13c59a88aa9634c8eeee01bde
# Parent  bc37eb38a4f44c9309131e6c0fa702e841e9efaf
Update: gcc+gcj (adjust for fastjar upgrade)

diff -r bc37eb38a4f4 -r 7fe791e8b986 gcc+gcj/receipt
--- a/gcc+gcj/receipt	Thu Jul 30 18:46:38 2009 +0200
+++ b/gcc+gcj/receipt	Thu Jul 30 13:25:19 2009 +0000
@@ -12,22 +12,16 @@
 xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
 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 \
+expat-dev zlib-dev fastjar gtk+-dev libart_lgpl-dev xorg-dev xorg-inputproto \
 xorg-kbproto xorg-libXtst xorg-randrproto xorg-renderproto xorg-xextproto xorg-xproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://gcc.gnu.org/"
+WEB_SITE="http://gcc.gnu.org/java/"
 WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
-PROVIDE="$SOURCE"
+PROVIDE="$SOURCE jre jdk"
 
 # 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"