diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-04-22 05:50:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-04-22 05:50:17 +0000 |
| commit | cce723c42cacf71cd25095c85922bf0cafd41f39 (patch) | |
| tree | baf61886a35fe81e83c9cd659bb41d359f92f6bc | |
| parent | update gcc local USE flags (diff) | |
| download | historical-cce723c42cacf71cd25095c85922bf0cafd41f39.tar.gz historical-cce723c42cacf71cd25095c85922bf0cafd41f39.tar.bz2 historical-cce723c42cacf71cd25095c85922bf0cafd41f39.zip | |
disable gcj/ada/f77/objc by default
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.3-r2.ebuild | 19 |
2 files changed, 15 insertions, 11 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index a4385026243b..a9f7c6ce068d 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,9 @@ # 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.211 2004/04/22 03:01:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.212 2004/04/22 05:50:17 vapier Exp $ + + 22 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-3.3.3-r2.ebuild: + Change the nogcj flag to gcj and add support for ada via an ada USE flag. 21 Apr 2004; Mike Frysinger <vapier@gentoo.org> gcc-3.2-r5 gcc-3.1-r8: These were never released so lets prune them. @@ -17,7 +20,7 @@ Clean up the ebuild (filter-flags and similar). 20 Apr 2004; <solar@gentoo.org> gcc-3.3.3-r2.ebuild: - add s390 gcc-3.3.3 patch from bug #47915, added USE flags for nof77, noobjc from + add s390 gcc-3.3.3 patch from bug #47915, added USE flags for f77, objc from bug #23171. *gcc-3.4.0_pre20040416 (19 Apr 2004) diff --git a/sys-devel/gcc/gcc-3.3.3-r2.ebuild b/sys-devel/gcc/gcc-3.3.3-r2.ebuild index 5ac651e3665a..8421a3fcdbd6 100644 --- a/sys-devel/gcc/gcc-3.3.3-r2.ebuild +++ b/sys-devel/gcc/gcc-3.3.3-r2.ebuild @@ -1,8 +1,8 @@ # 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.3-r2.ebuild,v 1.4 2004/04/22 03:01:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r2.ebuild,v 1.5 2004/04/22 05:50:17 vapier Exp $ -IUSE="static nls bootstrap java build X multilib nogcj nof77 noobjc hardened uclibc" +IUSE="static nls bootstrap java build X multilib gcj f77 objc ada hardened uclibc" KEYWORDS="~x86 ~mips ~sparc amd64 -hppa ~alpha ~ia64 ~ppc64 s390" inherit eutils flag-o-matic libtool @@ -384,18 +384,19 @@ src_compile() { local myconf= local gcc_lang= - if [ -z "`use build`" ] + if ! use build then myconf="${myconf} --enable-shared" gcc_lang="c,c++" - use nof77 || gcc_lang="${gcc_lang},f77" - use noobjc || gcc_lang="${gcc_lang},objc" - [ -n "`use java`" -a -z "`use nogcj`" ] && gcc_lang="${gcc_lang},java" + use f77 && gcc_lang="${gcc_lang},f77" + use objc && gcc_lang="${gcc_lang},objc" + use ada && gcc_lang="${gcc_lang},ada" + use java && use gcj && gcc_lang="${gcc_lang},java" # use ada && gcc_lang="${gcc_lang},ada" else gcc_lang="c" fi - if [ -z "`use nls`" -o -z "`use build`" ] + if ! use nls || use build then myconf="${myconf} --disable-nls" else @@ -407,7 +408,7 @@ 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 -z "`use nogcj`" -a \ + if [ -n "`use java`" -a -n "`use gcj`" -a \ -n "`use X`" -a -z "`use build`" -a \ -f /usr/X11R6/include/X11/Xlib.h ] then @@ -684,7 +685,7 @@ src_install() { cp -f docs/html/17_intro/[A-Z]* \ ${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/ - if [ -n "`use java`" -a -z "`use nogcj`" ] + if use java && use gcj then cd ${S}/fastjar docinto ${CCHOST}/fastjar |