diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-03-05 17:25:05 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-03-05 17:25:05 +0000 |
commit | e16b5af3a52d2edf8150de5d36efd288d46d2676 (patch) | |
tree | 10946b8171abf35f03addf8cc7eefeccfccc2958 /profiles | |
parent | sparc-tastic (diff) | |
download | gentoo-2-e16b5af3a52d2edf8150de5d36efd288d46d2676.tar.gz gentoo-2-e16b5af3a52d2edf8150de5d36efd288d46d2676.tar.bz2 gentoo-2-e16b5af3a52d2edf8150de5d36efd288d46d2676.zip |
Added GRP_STAGE23_USE, USE, CFLAGS, CXXFLAGS, and FEATURES from 2005.0/make.defaults to make.defaults, then cleaned up other profiles to suit.
Diffstat (limited to 'profiles')
5 files changed, 19 insertions, 51 deletions
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults index 6310abddaa0d..fb275da6b7d4 100644 --- a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults +++ b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults @@ -1,15 +1,6 @@ -# Copyright 2004 Gentoo Foundation. +# Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/make.defaults,v 1.11 2005/01/20 17:27:33 fmccor Exp $ - -# Compiler flags -CFLAGS="-O2 -pipe" -CXXFLAGS=${CFLAGS} - -# Misc -FEATURES="sandbox ccache" +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/make.defaults,v 1.12 2005/03/05 17:25:05 wolf31o2 Exp $ # USE settings -USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran f77 fbcon font-server foomaticdb gdbm gif gtk gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib gtk2" - -GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses gtk2" +USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran f77 fbcon font-server foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib" diff --git a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults index eef0690225f7..06a2b0f36cc4 100644 --- a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults +++ b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults @@ -1,16 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/make.defaults,v 1.10 2005/01/20 17:27:33 fmccor Exp $ - -# Compiler flags -CFLAGS="-O2 -pipe" -CXXFLAGS=${CFLAGS} - -# Misc -FEATURES="sandbox ccache" +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/make.defaults,v 1.11 2005/03/05 17:25:05 wolf31o2 Exp $ # USE settings USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran f77 fbcon font-server foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib" - -# Catalyst stage/grp USE -GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd" diff --git a/profiles/default-linux/sparc/sparc64/2005.0/make.defaults b/profiles/default-linux/sparc/sparc64/2005.0/make.defaults deleted file mode 100644 index 9b433a4e96f1..000000000000 --- a/profiles/default-linux/sparc/sparc64/2005.0/make.defaults +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/make.defaults,v 1.3 2005/01/17 17:49:43 fmccor Exp $ - -# Compiler flags -CFLAGS="-O2 -pipe" -CXXFLAGS=${CFLAGS} - -# Misc -FEATURES="sandbox ccache" - -# USE settings -USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib" - -# Catalyst stage/grp USE -GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd" diff --git a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults index 3a58b850583a..caf56a46e5b7 100644 --- a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults +++ b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults @@ -1,16 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults,v 1.9 2005/01/20 17:27:33 fmccor Exp $ - -# Compiler flags -CFLAGS="-O2 -pipe" -CXXFLAGS=${CFLAGS} - -# Misc -FEATURES="sandbox ccache" +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults,v 1.10 2005/03/05 17:25:05 wolf31o2 Exp $ # USE settings USE="alsa arts avi berkdb bitmap-fonts crypt cups dlloader encode esd font-server fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jack jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib" - -# Catalyst stage/grp USE -GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd" diff --git a/profiles/default-linux/sparc/sparc64/make.defaults b/profiles/default-linux/sparc/sparc64/make.defaults index f9e4d93a0b4d..6eb4a34bb7e9 100644 --- a/profiles/default-linux/sparc/sparc64/make.defaults +++ b/profiles/default-linux/sparc/sparc64/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/make.defaults,v 1.3 2005/02/11 00:30:24 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/make.defaults,v 1.4 2005/03/05 17:25:05 wolf31o2 Exp $ # 64bit kernel, 32bit userland CHOST="sparc-unknown-linux-gnu" @@ -9,3 +9,16 @@ PROFILE_ARCH="sparc64" # We need sparc64 binutils for linux-headers CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu" STAGE1_USE="gcc64" + +# Compiler flags +CFLAGS="-O2 -pipe" +CXXFLAGS=${CFLAGS} + +# Misc +FEATURES="sandbox ccache" + +# USE settings +USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib" + +# Catalyst stage/grp USE +GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd" |