diff options
| -rw-r--r-- | sys-devel/gcc-config/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-devel/gcc-config/files/gcc-config-1.4.1 | 37 | ||||
| -rw-r--r-- | sys-devel/gcc-config/gcc-config-1.4.1.ebuild | 9 |
3 files changed, 43 insertions, 12 deletions
diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog index 3a090d7818c4..286caf9820e8 100644 --- a/sys-devel/gcc-config/ChangeLog +++ b/sys-devel/gcc-config/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-devel/gcc-config -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.177 2008/03/16 12:40:34 phreak Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.178 2009/01/28 02:32:51 vapier Exp $ + + 28 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.4.1, + gcc-config-1.4.1.ebuild: + Update libgcj.pc symlinks #136382 #216241 and set GCC_SPECS with -E + #251271 by Diego E. Pettenò. 16 Mar 2008; Christian Heim <phreak@gentoo.org> Manifest: Fixing the Manifest (emerge is complaining about missing diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.1 b/sys-devel/gcc-config/files/gcc-config-1.4.1 index 081fbe0e174c..d487d85fe72d 100644 --- a/sys-devel/gcc-config/files/gcc-config-1.4.1 +++ b/sys-devel/gcc-config/files/gcc-config-1.4.1 @@ -1,7 +1,7 @@ #!/bin/bash -# Copyright 1999-2008 Gentoo Foundation +# 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/files/gcc-config-1.4.1,v 1.7 2008/03/16 01:20:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.8 2009/01/28 02:32:50 vapier Exp $ trap ":" INT QUIT TSTP @@ -19,6 +19,9 @@ umask 022 SED=$(type -P gsed) SED=${SED:-$(type -P sed)} +GENTOO_LIBDIR="@GENTOO_LIBDIR@" +[[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib" + usage() { cat << "USAGE_END" Usage: gcc-config [options] [CC Profile] @@ -273,7 +276,7 @@ switch_profile() { # Find the bin wrapper local wrapper - for wrapper in GENTOO_LIBDIR lib lib64 lib32 lib ; do + for wrapper in ${GENTOO_LIBDIR} lib lib64 lib32 lib ; do wrapper="${ROOT}usr/${wrapper}/misc/gcc-config" [[ -e ${wrapper} ]] && break done @@ -320,6 +323,18 @@ switch_profile() { cp -f "${wrapper}" "${ROOT}/lib/cpp" fi + # Relocate random crap + if ! is_cross_compiler ; then + if [[ -e ${ROOT}/usr/${GENTOO_LIBDIR}/pkgconfig/libgcj-${CC_COMP_VERSION}.pc ]] ; then + local mver=${CC_COMP_VERSION:0:3} + for x in "" "-${mver}" ; do + x="${ROOT}/usr/lib/pkgconfig/libgcj${x}.pc" + rm -f "${x}" + ln -s libgcj-${CC_COMP_VERSION}.pc "${x}" + done + fi + fi + # We need to make sure that libgcc_s.so / libunwind.so make it into /lib. # On many systems (x86/amd64/etc...), this will probably never matter, # but on other systems (arm/mips/etc...), this is quite critical. @@ -477,7 +492,12 @@ print_environ() { ;; esac - echo "${ENV_CMD} PATH${SET_ELEMENT}\"${GCC_PATH}:${PATH}\"" + ( + PATH=${GCC_PATH}:${PATH} + for var in PATH GCC_SPECS ; do + echo "${ENV_CMD} ${var}${SET_ELEMENT}\"${!var}\"" + done + ) } get_bin_path() { @@ -670,7 +690,14 @@ for x in "$@" ; do usage 0 ;; -V|--version) - echo "gcc-config-PORTAGE-VERSION" + rcsfile="$RCSfile: gcc-config-1.4.1,v $" + rcsfile=${rcsfile#: } + rcsfile=${rcsfile%,v*} + cvsrev="$Revision: 1.8 $" + cvsrev=${cvsrev#: } + cvsdate="$Date: 2009/01/28 02:32:50 $" + cvsdate=${cvsdate#: } + echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})" exit 0 ;; -*) diff --git a/sys-devel/gcc-config/gcc-config-1.4.1.ebuild b/sys-devel/gcc-config/gcc-config-1.4.1.ebuild index 1f47fa467bd4..0b844eef1145 100644 --- a/sys-devel/gcc-config/gcc-config-1.4.1.ebuild +++ b/sys-devel/gcc-config/gcc-config-1.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.1 2008/03/16 01:20:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.4.1.ebuild,v 1.2 2009/01/28 02:32:51 vapier Exp $ inherit flag-o-matic toolchain-funcs multilib @@ -13,7 +13,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="" RDEPEND="!app-admin/eselect-compiler" @@ -32,8 +32,7 @@ src_compile() { src_install() { newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config" sed -i \ - -e "s:PORTAGE-VERSION:${PVR}:g" \ - -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ + -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ "${D}"/usr/bin/${PN} exeinto /usr/$(get_libdir)/misc |