From fc3b8c360b654977ef745461581cfa455726cb60 Mon Sep 17 00:00:00 2001 From: Mark Loeser Date: Thu, 28 Apr 2011 23:27:02 +0000 Subject: Version bump to get a change made to the gcc-config bash script (Portage version: 2.2.0_alpha30/cvs/Linux x86_64, RepoMan options: --force) --- sys-devel/gcc-config/ChangeLog | 8 +++- sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild | 59 +++++++++++++++++++++++++ sys-devel/gcc-config/gcc-config-1.4.1.ebuild | 59 ------------------------- 3 files changed, 66 insertions(+), 60 deletions(-) create mode 100644 sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild delete mode 100644 sys-devel/gcc-config/gcc-config-1.4.1.ebuild (limited to 'sys-devel') diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog index 255768c4b877..31c7ae8e48fb 100644 --- a/sys-devel/gcc-config/ChangeLog +++ b/sys-devel/gcc-config/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/gcc-config # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.192 2011/03/21 13:49:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.193 2011/04/28 23:27:02 halcy0n Exp $ + +*gcc-config-1.4.1-r1 (28 Apr 2011) + + 28 Apr 2011; Mark Loeser -gcc-config-1.4.1.ebuild, + +gcc-config-1.4.1-r1.ebuild: + Version bump to get a change made to the gcc-config bash script 21 Mar 2011; Mike Frysinger files/gcc-config-1.5: Default to /etc/portage/make.conf #338032 by Dennis Schridde. diff --git a/sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild new file mode 100644 index 000000000000..6d2ddbe8e2ba --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild,v 1.1 2011/04/28 23:27:02 halcy0n Exp $ + +inherit flag-o-matic toolchain-funcs multilib + +# Version of .c wrapper to use +W_VER="1.5.1" + +DESCRIPTION="Utility to change the gcc compiler being used" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="" + +RDEPEND="!app-admin/eselect-compiler" + +S=${WORKDIR} + +src_unpack() { + cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die +} + +src_compile() { + strip-flags + emake CC="$(tc-getCC)" wrapper || die "compile wrapper" +} + +src_install() { + newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config" + sed -i \ + -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ + "${D}"/usr/bin/${PN} + + exeinto /usr/$(get_libdir)/misc + newexe wrapper gcc-config || die "install wrapper" +} + +pkg_postinst() { + # Scrub eselect-compiler remains + if [[ -e ${ROOT}/etc/env.d/05compiler ]] ; then + rm -f "${ROOT}"/etc/env.d/05compiler + fi + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config + + # Do we have a valid multi ver setup ? + if gcc-config --get-current-profile &>/dev/null ; then + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + [[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++ + [[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3 + gcc-config $(/usr/bin/gcc-config --get-current-profile) + fi +} diff --git a/sys-devel/gcc-config/gcc-config-1.4.1.ebuild b/sys-devel/gcc-config/gcc-config-1.4.1.ebuild deleted file mode 100644 index e5ea7dea44cf..000000000000 --- a/sys-devel/gcc-config/gcc-config-1.4.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.4.1.ebuild,v 1.9 2009/05/20 17:43:36 armin76 Exp $ - -inherit flag-o-matic toolchain-funcs multilib - -# Version of .c wrapper to use -W_VER="1.5.1" - -DESCRIPTION="Utility to change the gcc compiler being used" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="" - -RDEPEND="!app-admin/eselect-compiler" - -S=${WORKDIR} - -src_unpack() { - cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die -} - -src_compile() { - strip-flags - emake CC="$(tc-getCC)" wrapper || die "compile wrapper" -} - -src_install() { - newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config" - sed -i \ - -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ - "${D}"/usr/bin/${PN} - - exeinto /usr/$(get_libdir)/misc - newexe wrapper gcc-config || die "install wrapper" -} - -pkg_postinst() { - # Scrub eselect-compiler remains - if [[ -e ${ROOT}/etc/env.d/05compiler ]] ; then - rm -f "${ROOT}"/etc/env.d/05compiler - fi - - # Make sure old versions dont exist #79062 - rm -f "${ROOT}"/usr/sbin/gcc-config - - # Do we have a valid multi ver setup ? - if gcc-config --get-current-profile &>/dev/null ; then - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - [[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++ - [[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3 - gcc-config $(/usr/bin/gcc-config --get-current-profile) - fi -} -- cgit v1.2.3-65-gdbad