Make sure we use the -n option to 'eselect compiler set' when setting up the DEFAULT_ABI.

Package-Manager: portage-2.1_rc3-r2

4 files changed, 149 insertions, 8 deletions

diff --git a/app-admin/eselect-compiler/ChangeLog b/app-admin/eselect-compiler/ChangeLog
index b653e7f3ffc1..996f1a037cb2 100644
--- a/app-admin/eselect-compiler/ChangeLog
+++ b/app-admin/eselect-compiler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-compiler
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.15 2006/05/26 22:19:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.16 2006/06/01 09:24:12 eradicator Exp $
+
+*eselect-compiler-2.0.0_rc1-r3 (01 Jun 2006)
+
+  01 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +eselect-compiler-2.0.0_rc1-r3.ebuild:
+  Make sure we use the -n option to 'eselect compiler set' when setting up the
+  DEFAULT_ABI.
 
 *eselect-compiler-2.0.0_rc1-r2 (26 May 2006)
 
diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index 1fcf94c06097..dadaaf1e3226 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -14,10 +14,14 @@ EBUILD eselect-compiler-2.0.0_rc1-r2.ebuild 3773 RMD160 fae03db56fed581d1f066fd5
 MD5 2c81c4b0f3b6d850bd57cbd692925d9a eselect-compiler-2.0.0_rc1-r2.ebuild 3773
 RMD160 fae03db56fed581d1f066fd519114ae4d7cdd8bc eselect-compiler-2.0.0_rc1-r2.ebuild 3773
 SHA256 31becb85cd8fd8b6a25428c8cc23092a6a6d6cf014b5ddc621b56ca89e90e6a4 eselect-compiler-2.0.0_rc1-r2.ebuild 3773
-MISC ChangeLog 4307 RMD160 9eb18d8ab7f2c95be0b75716332463fc8d946c85 SHA1 016fdbd2e933bfafca7bd9f7c16ada5c966bf099 SHA256 e26bd448c81f5d53c8f8bba594f31e5088cf395bb3fe1c85f79e32ffeaaac57b
-MD5 b320bf0f3389c9672a03ca3e789b0bd0 ChangeLog 4307
-RMD160 9eb18d8ab7f2c95be0b75716332463fc8d946c85 ChangeLog 4307
-SHA256 e26bd448c81f5d53c8f8bba594f31e5088cf395bb3fe1c85f79e32ffeaaac57b ChangeLog 4307
+EBUILD eselect-compiler-2.0.0_rc1-r3.ebuild 3893 RMD160 e9b123a60b8c785eeb1e4f4910ea6c7b32c72877 SHA1 d7e42c810a82cc86091d32dab62e70f44348e5f9 SHA256 3f2c2bc5a261568b02278ab9fb6d0e4e46f59000307ce534902495dcd112ef6f
+MD5 0ae20a1af8e2db8ecd1e92536f9135d7 eselect-compiler-2.0.0_rc1-r3.ebuild 3893
+RMD160 e9b123a60b8c785eeb1e4f4910ea6c7b32c72877 eselect-compiler-2.0.0_rc1-r3.ebuild 3893
+SHA256 3f2c2bc5a261568b02278ab9fb6d0e4e46f59000307ce534902495dcd112ef6f eselect-compiler-2.0.0_rc1-r3.ebuild 3893
+MISC ChangeLog 4546 RMD160 8d48e2bf2344d7a5f96af195f9ed4fc26cf2b5dc SHA1 8202666ee3a26e6bf9be2c3005cbed83bc909ed9 SHA256 317c99ff9898932b36fcfbcdd755f63259ea3bc461c72fecd5682719168eaa29
+MD5 4aaf0ace187f73f037965368cd2dac19 ChangeLog 4546
+RMD160 8d48e2bf2344d7a5f96af195f9ed4fc26cf2b5dc ChangeLog 4546
+SHA256 317c99ff9898932b36fcfbcdd755f63259ea3bc461c72fecd5682719168eaa29 ChangeLog 4546
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -25,10 +29,13 @@ SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata
 MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-eselect-compiler-2.0.0_rc1-r2 277
 RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r2 277
 SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r2 277
+MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-eselect-compiler-2.0.0_rc1-r3 277
+RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r3 277
+SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r3 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD4DBQFEd/PNCRZPokWLroQRAmw9AKCWFG+i2b7/mkmxJheV44GLIdNOaACXR/TZ
-ZJc1vxfRm+1/80+pYmMt0Q==
-=NAmL
+iD8DBQFEfrJGOpjtAl+gMRURAnoRAJ4jxriIDHni4pxeVMLX8g/yucy7LgCfcT1j
+DQJn06ZzrFpwAsU3+E9ZvXY=
+=PUPy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r3.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r3.ebuild
new file mode 100644
index 000000000000..6afde0269c6a
--- /dev/null
+++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r3.ebuild,v 1.1 2006/06/01 09:24:12 eradicator Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Utility to configure the active toolchain compiler"
+HOMEPAGE="http://www.gentoo.org/"
+
+MY_PN="compiler-config"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+SRC_URI=" http://dev.gentoo.org/~eradicator/toolchain/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="hardened"
+
+RDEPEND=">=app-admin/eselect-1.0_rc1"
+
+# We want to verify that compiler profiles exist for our toolchain
+pkg_setup() {
+	local abi
+	for abi in $(get_all_abis) ; do
+		local ctarget=$(get_abi_CHOST ${abi})
+		if ! grep -q "^[[:space:]]*ctarget=${ctarget}$" ${ROOT}/etc/eselect/compiler/*.conf ; then
+			eerror "We weren't able to find a valid eselect compiler profile for ${abi}."
+			eerror "Please do the following to re-emerge gcc, then retry emerging"
+			eerror "eselect-compiler:"
+			eerror "# emerge -v --oneshot sys-devel/gcc"
+
+			die "Missing eselect-compiler profile for ${abi}"
+		fi
+	done
+}
+
+pkg_postinst() {
+	# Some toolchain.eclass installed confs had some bugs that need fixing
+	sed -i 's:chost:ctarget:g' ${ROOT}/etc/eselect/compiler/*
+	sed -i 's:spec=:specs=:g' ${ROOT}/etc/eselect/compiler/*
+
+	# Activate the profiles
+	if [[ ! -f "${ROOT}/etc/eselect/compiler/selection.conf" ]] ; then
+		ewarn "This looks like the first time you are installing eselect-compiler.  We are"
+		ewarn "activating toolchain profiles for the CTARGETs needed by your portage"
+		ewarn "profile You should have profiles installed from compilers that you emerged"
+		ewarn "after October, 2005. If a compiler you have installed is missing an"
+		ewarn "eselect-compiler profile, you can either re-emerge the compiler, create the"
+		ewarn "profile yourself, or you can migrate profiles from gcc-config-1.x by doing:"
+		ewarn "# eselect compiler migrate"
+		ewarn
+		ewarn "Note that if you use the migration tool, your current profiles will be"
+		ewarn "replaced, so you should backup the data in /etc/eselect/compiler first."
+		echo
+		einfo "The following profiles have been activated.  If an incorrect profile is"
+		einfo "chosen or an error is reported, please use 'eselect compiler set' to"
+		einfo "manually choose it"
+
+		local abi
+		for abi in $(get_all_abis) ; do
+			local ctarget=$(get_abi_CHOST ${abi})
+			local extra_options=""
+
+			if [[ ${abi} == ${DEFAULT_ABI} ]] ; then
+				extra_options="-n"
+			fi
+
+			local spec
+			if use hardened ; then
+				spec="hardened"
+			else
+				spec="vanilla"
+			fi
+
+			local isset=0
+			local tuple
+			for tuple in "${CHOST}" "${CTARGET}" "${ctarget}" ; do
+				local version
+				for version in "$(gcc-fullversion)" ; do
+					local profile
+					for profile in "${abi}-${spec}" "${spec}" "${abi}-default" "default" "${abi}-vanilla" "vanilla" ; do
+						if eselect compiler set ${tuple}-${version}/${profile} ${extra_options} &> /dev/null ; then
+							einfo "${abi}: ${tuple}-${version}/${profile}"
+
+							isset=1
+							break
+						fi
+					done
+					[[ ${isset} == 1 ]] && break
+				done
+				[[ ${isset} == 1 ]] && break
+			done
+
+			if [[ ${isset} == 0 ]] ; then
+				eerror "${abi}: Unable to determine an appropriate profile.  Please set manually."
+			fi
+		done
+	else
+		eselect compiler update
+	fi
+
+	if rm -f ${ROOT}/etc/env.d/05gcc* &> /dev/null ; then
+		echo
+		ewarn "You should source /etc/profile in your open shells."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-inherit.patch
+}
+
+src_install() {
+	dodoc README
+	make DESTDIR="${D}" install || die
+
+	doenvd ${FILESDIR}/25eselect-compiler
+
+	# This is installed by sys-devel/gcc-config
+	rm ${D}/usr/bin/gcc-config
+}
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r3 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r3
new file mode 100644
index 000000000000..e5670a7296b1
--- /dev/null
+++ b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r3
@@ -0,0 +1,3 @@
+MD5 b67d2f339f159da455d19c49e4868d9c compiler-config-2.0.0_rc1.tar.gz 117180
+RMD160 dbcd8120139c75f40ae2405746ab2a5f26e810b4 compiler-config-2.0.0_rc1.tar.gz 117180
+SHA256 a911a7b0a1184c576500df8530e77823f976dce387001c581ba89ac8edfe30c2 compiler-config-2.0.0_rc1.tar.gz 117180