diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2006-06-25 05:45:59 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2006-06-25 05:45:59 +0000 |
commit | 5bdcb0917ec038929d467e6758fbd762145cb384 (patch) | |
tree | d75e8cdfbfbce0437a89a79d5e5a4bb6abb44e41 /app-admin | |
parent | teach people how to quote variables (diff) | |
download | gentoo-2-5bdcb0917ec038929d467e6758fbd762145cb384.tar.gz gentoo-2-5bdcb0917ec038929d467e6758fbd762145cb384.tar.bz2 gentoo-2-5bdcb0917ec038929d467e6758fbd762145cb384.zip |
Fixed bug #135688 which resulted in some wrappers not getting dedleted when profiles were switched.
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'app-admin')
3 files changed, 176 insertions, 0 deletions
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc2-r1.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc2-r1.ebuild new file mode 100644 index 000000000000..d5002279afc5 --- /dev/null +++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc2-r1.ebuild @@ -0,0 +1,160 @@ +# 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_rc2-r1.ebuild,v 1.1 2006/06/25 05:45:59 eradicator Exp $ + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Utility to configure the active toolchain compiler" +HOMEPAGE="http://www.gentoo.org/" + +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="hardened" + +RDEPEND=">=app-admin/eselect-1.0_rc1" + +# We want to verify that compiler profiles exist for our toolchain +pkg_setup() { + delete_invalid_profiles + + 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() { + # For bug #135749 + cp -f "${ROOT}"/usr/libexec/eselect/compiler/compiler-wrapper "${ROOT}"/lib/cpp + + # 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 + + local file + local resource_profile=0 + for file in ${ROOT}/etc/env.d/05gcc* ; do + if [[ -f ${file} ]] ; then + ewarn "Removing env.d entry which was used by gcc-config:" + ewarn " ${file}" + + rm -f ${file} + + resource_profile=1 + fi + done + + if [[ ${resource_profile} == 1 ]] ; then + echo + ewarn "You should source /etc/profile in your open shells." + + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/eselect-compiler-2.0.0_rc2-bug135688.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 +} + +# The profiles are protected by CONFIG_PROJECT until eselect-compiler is installed, so we need to clean out +# the invalid profiles when eselect-compiler is first installed +delete_invalid_profiles() { + # Some toolchain.eclass installed confs had some bugs in them. We + # could just use sed to update them, but then portage won't remove + # them automatically on unmerge. + local file + for file in $(grep "^[[:space:]]*chost=" ${ROOT}/etc/eselect/compiler/*.conf | cut -f1 -d:) ; do + rm ${file} + done + for file in $(grep "^[[:space:]]*spec=" ${ROOT}/etc/eselect/compiler/*.conf | cut -f1 -d:) ; do + rm ${file} + done + + # First we need to clean out /etc/eselect/compiler as there may + # be some profiles in there which were not unmerged with gcc. + local item + for item in $(grep "^[[:space:]]*binpath=" ${ROOT}/etc/eselect/compiler/*.conf | sed 's/:.*binpath=/:/') ; do + local file=${item%:*} + local binpath=${item#*:} + [[ -d ${binpath} ]] || rm ${file} + done +} + diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc2-r1 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc2-r1 new file mode 100644 index 000000000000..dbd66016d2ae --- /dev/null +++ b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc2-r1 @@ -0,0 +1,3 @@ +MD5 278f76e8542bfc8859759fcd475c54f2 eselect-compiler-2.0.0_rc2.tar.gz 117489 +RMD160 03e6a8aa2d04a2c0b931325213ce224e5dceb7fe eselect-compiler-2.0.0_rc2.tar.gz 117489 +SHA256 fbd953c79e7d74636d16b70324f4f6573a0993d257212f5f6c04fe866d458eb9 eselect-compiler-2.0.0_rc2.tar.gz 117489 diff --git a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_rc2-bug135688.patch b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_rc2-bug135688.patch new file mode 100644 index 000000000000..1b5c3e4542f3 --- /dev/null +++ b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_rc2-bug135688.patch @@ -0,0 +1,13 @@ +Index: compiler.eselect.in +=================================================================== +--- compiler-config-2.0.0_rc2/src/profile-manager/compiler.eselect.in (revision 271) ++++ compiler-config-2.0.0_rc2/src/profile-manager/compiler.eselect.in (working copy) +@@ -380,7 +380,7 @@ + postopts="${postopts} --native" + else + # Figure out what bins are installed for the default CTARGET in case we are or are becoming default +- set_v="COMPILER_CONFIG_SET_${COMPILER_CONFIG_DEFAULT_CTARGET}" ++ set_v="COMPILER_CONFIG_SET_${COMPILER_CONFIG_DEFAULT_CTARGET//[-.]/_}" + if [[ -n ${!set_v} ]] ; then + oldprofile=${!set_v} + |