wok rev 3781

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