From 0c2cdbfc89d1b0fe3eb17185b3b8c918081d46ce Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 21 Jun 2006 18:33:51 +0000 Subject: [PATCH] Release to address bugs #136585 and #137251. Package-Manager: portage-2.1.1_pre1-r1 --- app-admin/eselect-compiler/ChangeLog | 8 +- app-admin/eselect-compiler/Manifest | 26 ++- .../eselect-compiler-2.0.0_rc2.ebuild | 154 ++++++++++++++++++ .../files/digest-eselect-compiler-2.0.0_rc2 | 3 + 4 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 app-admin/eselect-compiler/eselect-compiler-2.0.0_rc2.ebuild create mode 100644 app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc2 diff --git a/app-admin/eselect-compiler/ChangeLog b/app-admin/eselect-compiler/ChangeLog index 1b77bea6a05d..cb93de243765 100644 --- a/app-admin/eselect-compiler/ChangeLog +++ b/app-admin/eselect-compiler/ChangeLog @@ -1,6 +1,12 @@ # 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.24 2006/06/15 19:03:06 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.25 2006/06/21 18:33:51 eradicator Exp $ + +*eselect-compiler-2.0.0_rc2 (21 Jun 2006) + + 21 Jun 2006; Jeremy Huddleston + +eselect-compiler-2.0.0_rc2.ebuild: + Release to address bugs #136585 and #137251. 16 Jun 2006; Joshua Kinard eselect-compiler-2.0.0_rc1-r6.ebuild: diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest index 26191a484204..107326897784 100644 --- a/app-admin/eselect-compiler/Manifest +++ b/app-admin/eselect-compiler/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 25eselect-compiler 44 RMD160 0792a5df6708dba634e2a33f6c1baa580637f031 SHA1 b8e52e7f30d30cde19e96e1c6ae4138f5b384b1a SHA256 20bd17134dd852bd5fecd8b344e132445672f350614a7280e34b322ae8898507 MD5 19c86a8070333c2a4eb2782a94c99dc0 files/25eselect-compiler 44 RMD160 0792a5df6708dba634e2a33f6c1baa580637f031 files/25eselect-compiler 44 @@ -11,14 +14,19 @@ MD5 41ae1c7a156d13710a458bd1a70078f3 files/eselect-compiler-2.0.0_rc1-inherit.pa RMD160 67805308fc7dacb16730873b2cc72f902b0ed61f files/eselect-compiler-2.0.0_rc1-inherit.patch 645 SHA256 b22f15cf016ee3e4314a88c148c3b2fd02fc97128a94af5eab0fb015939a61fe files/eselect-compiler-2.0.0_rc1-inherit.patch 645 DIST compiler-config-2.0.0_rc1.tar.gz 117180 RMD160 dbcd8120139c75f40ae2405746ab2a5f26e810b4 SHA1 3a1a1605dd0e8b59ba5d796c4583244f46f97a03 SHA256 a911a7b0a1184c576500df8530e77823f976dce387001c581ba89ac8edfe30c2 +DIST eselect-compiler-2.0.0_rc2.tar.gz 117489 RMD160 03e6a8aa2d04a2c0b931325213ce224e5dceb7fe SHA1 97084a5a00357247c6158c72047f7254a42501d6 SHA256 fbd953c79e7d74636d16b70324f4f6573a0993d257212f5f6c04fe866d458eb9 EBUILD eselect-compiler-2.0.0_rc1-r6.ebuild 5066 RMD160 c5346c23d35bc3bde6a76537bd00c31f1d565c63 SHA1 75c7329de06e51d5e5f931201feed2922edecb59 SHA256 8890b2609456b997b4b9b75df3111e40279ff20a4f831a4fc5e6f7613205c36d MD5 bf165cf2ee7eaa1bd65691d8e5f3c22c eselect-compiler-2.0.0_rc1-r6.ebuild 5066 RMD160 c5346c23d35bc3bde6a76537bd00c31f1d565c63 eselect-compiler-2.0.0_rc1-r6.ebuild 5066 SHA256 8890b2609456b997b4b9b75df3111e40279ff20a4f831a4fc5e6f7613205c36d eselect-compiler-2.0.0_rc1-r6.ebuild 5066 -MISC ChangeLog 6382 RMD160 0b42c60f5c2b3db1de5370a8a166a8225fd8b20f SHA1 5624aed317514e57c01744491025e245273a61a2 SHA256 7f12b15ea8c5b4d0407fcb7c3df83469df26ff012cf8fcc2138ffb653a1559c3 -MD5 4a6258652ced33c17316df100cff8c62 ChangeLog 6382 -RMD160 0b42c60f5c2b3db1de5370a8a166a8225fd8b20f ChangeLog 6382 -SHA256 7f12b15ea8c5b4d0407fcb7c3df83469df26ff012cf8fcc2138ffb653a1559c3 ChangeLog 6382 +EBUILD eselect-compiler-2.0.0_rc2.ebuild 4836 RMD160 4bdb892dcaabe82ab5f898c82f3e3c5670191b49 SHA1 db890b6454315b5db9e6c50febb2512c00b04b70 SHA256 1e3bb72a9c745332cc7a49015354fceba25d19e2aaf2525206bb90e34e9b4db5 +MD5 57190ea365607735e9077dcaf661de38 eselect-compiler-2.0.0_rc2.ebuild 4836 +RMD160 4bdb892dcaabe82ab5f898c82f3e3c5670191b49 eselect-compiler-2.0.0_rc2.ebuild 4836 +SHA256 1e3bb72a9c745332cc7a49015354fceba25d19e2aaf2525206bb90e34e9b4db5 eselect-compiler-2.0.0_rc2.ebuild 4836 +MISC ChangeLog 6573 RMD160 fcfa36cff0bf098c903017bf13f17d9930410b3d SHA1 7dcd6627d129e6bf133ccba74e7d06db55ec466d SHA256 0af08931c9bfcad446e90c0d1f42d9c43147cbfb0b78437529fd427df6295b8b +MD5 61cb43135e8c428b4a7cc73044576623 ChangeLog 6573 +RMD160 fcfa36cff0bf098c903017bf13f17d9930410b3d ChangeLog 6573 +SHA256 0af08931c9bfcad446e90c0d1f42d9c43147cbfb0b78437529fd427df6295b8b ChangeLog 6573 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162 @@ -26,3 +34,13 @@ SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-eselect-compiler-2.0.0_rc1-r6 277 RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r6 277 SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r6 277 +MD5 fd67966cee9d0e3df4074312e90890f7 files/digest-eselect-compiler-2.0.0_rc2 280 +RMD160 fd9726bdf30b04feab248c39a251eb2970abd6e0 files/digest-eselect-compiler-2.0.0_rc2 280 +SHA256 bb2674b9c7b6583e433282c764ec02799852867226fec4708f62c60825ecaf43 files/digest-eselect-compiler-2.0.0_rc2 280 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEmZEaOpjtAl+gMRURAp2FAKC9THNrVIOMEoePVr+DlvEQWw1BNQCcDdKZ +X/pUakfGb/qcYLFSd0J8ik0= +=jUZP +-----END PGP SIGNATURE----- diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc2.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc2.ebuild new file mode 100644 index 000000000000..7ab76495c3cc --- /dev/null +++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc2.ebuild @@ -0,0 +1,154 @@ +# 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.ebuild,v 1.1 2006/06/21 18:33:51 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 ~x86-fbsd" +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_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 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc2 new file mode 100644 index 000000000000..dbd66016d2ae --- /dev/null +++ b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc2 @@ -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 -- 2.26.2