SliTaz Repositories

     1.1 --- a/gcc+gcj/receipt	Tue Jul 14 13:36:14 2009 +0000
     1.2 +++ b/gcc+gcj/receipt	Wed Jul 15 12:26:36 2009 +0000
     1.3 @@ -6,13 +6,14 @@
     1.4  CATEGORY="development"
     1.5  SHORT_DESC="The GNU Compiler Collection, including the gcj Compiler for Java."
     1.6  MAINTAINER="rcx@zoominternet.net"
     1.7 -DEPENDS="glibc-base glib gcc-lib-base libuuid zlib libgomp gmp mpfr python \
     1.8 -gtk+ atk cairo expat fontconfig freetype libgio pango pixman libpng \
     1.9 +DEPENDS="glibc-base glib gcc-lib-base libgio libuuid zlib libgomp gmp mpfr python \
    1.10 +gtk+ atk cairo expat fontconfig freetype pango pixman libpng libxcb xcb-util \
    1.11  xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
    1.12  xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
    1.13  xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXtst"
    1.14 -BUILD_DEPENDS="glibc-dev gawk flex python gmp gmp-dev mpfr mpfr-dev expat-dev \
    1.15 -zlib-dev zip gtk+-dev libart_lgpl-dev xorg-dev xorg-inputproto xorg-randrproto xorg-xextproto"
    1.16 +BUILD_DEPENDS="glibc-dev gawk flex python perl gmp gmp-dev mpfr mpfr-dev \
    1.17 +expat-dev zlib-dev zip gtk+-dev libart_lgpl-dev xorg-dev xorg-inputproto \
    1.18 +xorg-kbproto xorg-randrproto xorg-renderproto xorg-xextproto xorg-xproto"
    1.19  TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.20  WEB_SITE="http://gcc.gnu.org/"
    1.21  WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
    1.22 @@ -21,6 +22,12 @@
    1.23  # Rules to configure and make the package.
    1.24  compile_rules()
    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"
    1.29 +	fi
    1.30 +	GCC_TARGET=$BUILD_HOST
    1.31 +
    1.32  	# Get ecj.jar needed to build gcj
    1.33  	# (See http://gcc.gnu.org/install/configure.html --with-ecj-jar)
    1.34  	ECJ_PRE_PATH=`pwd`
    1.35 @@ -52,17 +59,21 @@
    1.36  		$SOURCE-$VERSION/libiberty/Makefile.in || exit 1
    1.37      mkdir -p $SOURCE-$VERSION-build
    1.38      cd $SOURCE-$VERSION-build
    1.39 +	
    1.40      ../$SOURCE-$VERSION/configure --prefix=/usr --libexecdir=/usr/lib \
    1.41  		--infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \
    1.42  		--enable-languages=c,c++,java --enable-shared --with-system-zlib \
    1.43  		--enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \
    1.44 -		--enable-threads=posix --with-tune=i486 i486-pc-linux-gnu \
    1.45 +		--enable-threads=posix --with-tune=i486 \
    1.46  		--enable-java-home --with-arch-directory=i386 \
    1.47 +		--with-jvm-root-dir=/usr/lib/jvm/java-gcj \
    1.48 +		--with-jvm-jar-dir=/usr/lib/jvm-exports/java-gcj \
    1.49  		--with-python-dir=/lib/python2.5/site-packages \
    1.50  		--with-x --enable-java-awt=gtk \
    1.51 -		$CONFIGURE_ARGS  &&
    1.52 +		--enable-gtk-cairo \
    1.53 +		$CONFIGURE_ARGS  $GCC_TARGET  &&
    1.54      make bootstrap &&
    1.55 -    # Make install in the source tree to help creating derivated pkgs
    1.56 +    # Make install in the source tree to help creating derived pkgs
    1.57      # and keep $_pkg variable set for genpkg.
    1.58      make DESTDIR=$src/_pkg install
    1.59  }