diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-02-15 22:58:33 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-02-15 22:58:33 +0000 |
| commit | 8afb5b2e963d269b70e0d973c2ac9516bf7c7b56 (patch) | |
| tree | 7f4bf43374387ffd0ab9a94aabe44389fd17c5bf /sys-libs | |
| parent | Fix bug 251779 with ebuild from Michael Mair-Keimberger <miki3@gmx.net>. Also... (diff) | |
| download | gentoo-2-8afb5b2e963d269b70e0d973c2ac9516bf7c7b56.tar.gz gentoo-2-8afb5b2e963d269b70e0d973c2ac9516bf7c7b56.tar.bz2 gentoo-2-8afb5b2e963d269b70e0d973c2ac9516bf7c7b56.zip | |
Use the common gcc patchset.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch | 12 | ||||
| -rw-r--r-- | sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild | 9 |
3 files changed, 11 insertions, 18 deletions
diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog index 9e1cc4d1154c..9b26a8d48012 100644 --- a/sys-libs/libstdc++-v3/ChangeLog +++ b/sys-libs/libstdc++-v3/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libstdc++-v3 -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.56 2009/02/05 04:12:56 je_fro Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.57 2009/02/15 22:58:32 vapier Exp $ + + 15 Feb 2009; Mike Frysinger <vapier@gentoo.org> + -files/libstdc++-v3-open_missing_mode.patch, libstdc++-v3-3.3.6.ebuild: + Use the common gcc patchset. 05 Feb 2009; Jeff Gardner <je_fro@gentoo.org> +files/libstdc++-v3-open_missing_mode.patch, libstdc++-v3-3.3.6.ebuild: diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch deleted file mode 100644 index 610fae2bb39b..000000000000 --- a/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru /var/tmp/portage/sys-libs/libstdc++-v3-3.3.6/work/gcc-3.3.6/gcc/collect2.c /root/hardened/gcc-3.3.6/gcc/collect2.c ---- /gcc-3.3.6/gcc/collect2.c 2003-12-08 20:02:39.000000000 +0100 -+++ /gcc-3.3.6/gcc/collect2.c 2008-06-19 01:04:21.000000000 +0200 -@@ -1572,7 +1572,7 @@ - if (redir) - { - /* Open response file. */ -- redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT); -+ redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); - - /* Duplicate the stdout and stderr file handles - so they can be restored later. */ diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild index 4087f68bb076..71cdb541060f 100644 --- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild +++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.20 2009/02/05 04:12:56 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.21 2009/02/15 22:58:32 vapier Exp $ inherit eutils flag-o-matic libtool gnuconfig versionator @@ -105,6 +105,7 @@ S=${WORKDIR}/gcc-${PV} # Theoretical cross compiler support [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}" +PATCH_VER="1.6" LOC="/usr" #MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" #MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" @@ -118,7 +119,8 @@ DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" # We will handle /usr/include/g++-v3/ with gcc-config ... STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}" -SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2" +SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 + mirror://gentoo/gcc-${PV}-patches-${PATCH_VER}.tar.bz2" DESCRIPTION="Compatibility package for running binaries linked against a pre gcc 3.4 libstdc++" HOMEPAGE="http://gcc.gnu.org/libstdc++/" @@ -158,8 +160,7 @@ src_unpack() { unpack ${A} cd "${S}" - - epatch "${FILESDIR}"/libstdc++-v3-open_missing_mode.patch || die "epatch failed" + EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch # Fixup libtool to correctly generate .la files with portage elibtoolize --portage --shallow |