diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-05-19 19:45:23 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-05-19 19:45:23 +0000 |
commit | d8c86d76cc9c7b5e0c6092d100780a4ac2b1ccef (patch) | |
tree | 82f87e5a0bbd3c2e29126dda0b3b4f59d04a7746 /sys-devel | |
parent | Version bump (diff) | |
download | gentoo-2-d8c86d76cc9c7b5e0c6092d100780a4ac2b1ccef.tar.gz gentoo-2-d8c86d76cc9c7b5e0c6092d100780a4ac2b1ccef.tar.bz2 gentoo-2-d8c86d76cc9c7b5e0c6092d100780a4ac2b1ccef.zip |
fix Swing bork during bootstrap
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/gcc/ChangeLog | 6 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 90a5daef99c5..06feb9054f70 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gcc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.98 2003/05/18 07:41:28 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.99 2003/05/19 19:45:23 azarah Exp $ + + 19 May 2003; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.ebuild : + Only compile gcj AWT/Swing support if we have the Xlib.h header, else + it borks during bootstrap. *gcc-3.3 (17 May 2003) diff --git a/sys-devel/gcc/gcc-3.3.ebuild b/sys-devel/gcc/gcc-3.3.ebuild index de14fe83ea7e..ce5494f17be7 100644 --- a/sys-devel/gcc/gcc-3.3.ebuild +++ b/sys-devel/gcc/gcc-3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.ebuild,v 1.2 2003/05/18 13:50:06 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.ebuild,v 1.3 2003/05/19 19:45:23 azarah Exp $ IUSE="static nls bootstrap java build X" @@ -260,7 +260,8 @@ src_compile() { # 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 [ -n "`use java`" -a -n "`use X`" -a -z "`use build`" ] + if [ -n "`use java`" -a -n "`use X`" -a -z "`use build`" -a \ + -f /usr/X11R6/include/X11/Xlib.h ] then myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x" |