diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2004-02-12 18:06:53 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2004-02-12 18:06:53 +0000 |
| commit | d81c5be3199ee3130645eab9f8f4d6c0f661862f (patch) | |
| tree | 21ed9a1b9e68ffba9ecb9cc97d19ca73cca96ec9 /sys-devel/gcc | |
| parent | Add nogcj USE flag (diff) | |
| download | gentoo-2-d81c5be3199ee3130645eab9f8f4d6c0f661862f.tar.gz gentoo-2-d81c5be3199ee3130645eab9f8f4d6c0f661862f.tar.bz2 gentoo-2-d81c5be3199ee3130645eab9f8f4d6c0f661862f.zip | |
Add nogcj USE flag to turn off building of gcj.
Diffstat (limited to 'sys-devel/gcc')
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.2-r5.ebuild | 9 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.2-r7.ebuild | 9 |
3 files changed, 15 insertions, 9 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 3c1d7074706e..385821bc701e 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gcc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.174 2004/02/12 17:49:49 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.175 2004/02/12 18:06:42 azarah Exp $ + + 12 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild, + gcc-3.3.2-r7.ebuild: + Add nogcj USE flag to turn off building of gcj. 12 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild, gcc-3.3.2-r7.ebuild: diff --git a/sys-devel/gcc/gcc-3.3.2-r5.ebuild b/sys-devel/gcc/gcc-3.3.2-r5.ebuild index d5ae2a010288..07e82de1455d 100644 --- a/sys-devel/gcc/gcc-3.3.2-r5.ebuild +++ b/sys-devel/gcc/gcc-3.3.2-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.2-r5.ebuild,v 1.10 2004/02/12 17:49:49 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r5.ebuild,v 1.11 2004/02/12 18:06:52 azarah Exp $ IUSE="static nls bootstrap java build X multilib" @@ -333,7 +333,7 @@ src_compile() { else myconf="${myconf} --enable-nls --without-included-gettext" fi - if [ -n "`use java`" -a -z "`use build`" ] + if [ -n "`use java`" -a -z "`use nogcj`" -a -z "`use build`" ] then gcc_lang="${gcc_lang},java" fi @@ -343,7 +343,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`" -a \ + if [ -n "`use java`" -a -z "`use nogcj`" -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" @@ -614,7 +615,7 @@ src_install() { cp -f docs/html/17_intro/[A-Z]* \ ${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/ - if [ -n "`use java`" ] + if [ -n "`use java`" -a -z "`use nogcj`" ] then cd ${S}/fastjar docinto ${CCHOST}/fastjar diff --git a/sys-devel/gcc/gcc-3.3.2-r7.ebuild b/sys-devel/gcc/gcc-3.3.2-r7.ebuild index 8b3339d1654f..cbe3a64885ce 100644 --- a/sys-devel/gcc/gcc-3.3.2-r7.ebuild +++ b/sys-devel/gcc/gcc-3.3.2-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.2-r7.ebuild,v 1.4 2004/02/12 17:49:49 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.5 2004/02/12 18:06:53 azarah Exp $ IUSE="static nls bootstrap java build X multilib" @@ -360,7 +360,7 @@ src_compile() { else myconf="${myconf} --enable-nls --without-included-gettext" fi - if [ -n "`use java`" -a -z "`use build`" ] + if [ -n "`use java`" -a -z "`use nogcj`" -a -z "`use build`" ] then gcc_lang="${gcc_lang},java" fi @@ -370,7 +370,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`" -a \ + if [ -n "`use java`" -a -z "`use nogcj`" -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" @@ -641,7 +642,7 @@ src_install() { cp -f docs/html/17_intro/[A-Z]* \ ${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/ - if [ -n "`use java`" ] + if [ -n "`use java`" -a -z "`use nogcj`" ] then cd ${S}/fastjar docinto ${CCHOST}/fastjar |