diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-07-11 20:34:27 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-07-11 20:34:27 +0000 |
| commit | 58e4663c0f1dbcfc96332de06048026ef2c6e3a5 (patch) | |
| tree | 02910d281d2f5150505927fa65fd1b8c671db753 /sys-devel/gcc/gcc-3.4.0-r6.ebuild | |
| parent | Stable on alpha, requested in bug 56498. (Manifest recommit) (diff) | |
| download | gentoo-2-58e4663c0f1dbcfc96332de06048026ef2c6e3a5.tar.gz gentoo-2-58e4663c0f1dbcfc96332de06048026ef2c6e3a5.tar.bz2 gentoo-2-58e4663c0f1dbcfc96332de06048026ef2c6e3a5.zip | |
xlib peers are deprecated in libjava 3.4.0, switching gcc 3.4 ebuilds to gtk2
Diffstat (limited to 'sys-devel/gcc/gcc-3.4.0-r6.ebuild')
| -rw-r--r-- | sys-devel/gcc/gcc-3.4.0-r6.ebuild | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sys-devel/gcc/gcc-3.4.0-r6.ebuild b/sys-devel/gcc/gcc-3.4.0-r6.ebuild index 2e1e4d4fb0b3..e0ff331f6776 100644 --- a/sys-devel/gcc/gcc-3.4.0-r6.ebuild +++ b/sys-devel/gcc/gcc-3.4.0-r6.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r6.ebuild,v 1.16 2004/07/06 21:57:00 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r6.ebuild,v 1.17 2004/07/11 20:34:27 lv Exp $ -IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc n32 n64" +IUSE="static nls bootstrap build multilib gcj gtk2 f77 objc hardened uclibc n32 n64" inherit eutils flag-o-matic libtool gnuconfig @@ -166,6 +166,7 @@ DEPEND="virtual/libc >=sys-devel/bison-1.875 >=sys-devel/gcc-config-1.3.1 amd64? ( multilib? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) ) + !build? ( gcj? ( gtk2? ( >=x11-libs/gtk+-2.2 ) ) ) !build? ( >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) )" @@ -511,7 +512,7 @@ src_compile() { gcc_lang="c,c++" use f77 && gcc_lang="${gcc_lang},f77" use objc && gcc_lang="${gcc_lang},objc" - use java && use gcj && gcc_lang="${gcc_lang},java" + use gcj && gcc_lang="${gcc_lang},java" # We do NOT want 'ADA support' in here! # use ada && gcc_lang="${gcc_lang},ada" else @@ -524,15 +525,12 @@ src_compile() { myconf="${myconf} --enable-nls --without-included-gettext" fi - # Enable building of the gcj Java AWT & Swing X11 backend - # if we have X as a use flag and are not in a build stage. - # X11 support is still very experimental but enabling it is - # quite innocuous... [No, gcc is *not* linked to X11...] - # <dragon@gentoo.org> (15 May 2003) - if ! use build && use java && use gcj && use X && [ -f /usr/X11R6/include/X11/Xlib.h ] + # GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained + # right now). Much thanks to <csm@gnu.org> for the heads up. + # Travis Tilley <lv@gentoo.org> (11 Jul 2004) + if ! use build && use gcj && use gtk2 then - myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" - myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x" + myconf="${myconf} --enable-java-awt=gtk" fi # Multilib not yet supported @@ -859,7 +857,7 @@ src_install() { cp -f docs/html/17_intro/[A-Z]* \ ${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/ - if use java && use gcj + if use gcj then cd ${S}/fastjar docinto ${CCHOST}/fastjar |