diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-10-02 22:28:22 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-10-02 22:29:17 +0100 |
| commit | 83d4a0d2f242693aeac13f8333b8e9f6033ed972 (patch) | |
| tree | 1429d2b6cda2efd4beaa60f5b726253241f3fe2c | |
| parent | dev-php/pecl-geoip: amd64 stable wrt bug #667082 (diff) | |
| download | gentoo-83d4a0d2.tar.gz gentoo-83d4a0d2.tar.bz2 gentoo-83d4a0d2.zip | |
sys-libs/libstdc++-v3: bump 1.10 patchset
Reported-by: jms
Closes: https://bugs.gentoo.org/665768
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
| -rw-r--r-- | sys-libs/libstdc++-v3/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch | 33 | ||||
| -rw-r--r-- | sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild | 9 |
3 files changed, 5 insertions, 39 deletions
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest index 4e999dbedd24..816a3df55a05 100644 --- a/sys-libs/libstdc++-v3/Manifest +++ b/sys-libs/libstdc++-v3/Manifest @@ -1,2 +1,2 @@ -DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c +DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch deleted file mode 100644 index a444da2d2bfc..000000000000 --- a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux.h gcc-3.3.6/gcc/config/i386/linux.h ---- gcc-3.3.6.orig/gcc/config/i386/linux.h 2018-01-01 20:14:36.311860098 +0100 -+++ gcc-3.3.6/gcc/config/i386/linux.h 2018-01-01 20:16:05.912287579 +0100 -@@ -261,7 +261,7 @@ - siginfo_t *pinfo; \ - void *puc; \ - siginfo_t info; \ -- struct ucontext uc; \ -+ struct ucontext_t uc; \ - } *rt_ = (CONTEXT)->cfa; \ - sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ - } \ -diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux64.h gcc-3.3.6/gcc/config/i386/linux64.h ---- gcc-3.3.6.orig/gcc/config/i386/linux64.h 2018-01-01 20:14:36.271859907 +0100 -+++ gcc-3.3.6/gcc/config/i386/linux64.h 2018-01-01 20:16:05.912287579 +0100 -@@ -112,7 +112,7 @@ - if (*(unsigned char *)(pc_+0) == 0x48 \ - && *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7) \ - { \ -- struct ucontext *uc_ = (CONTEXT)->cfa; \ -+ struct ucontext_t *uc_ = (CONTEXT)->cfa; \ - sc_ = (struct sigcontext *) &uc_->uc_mcontext; \ - } \ - else \ -@@ -182,7 +182,7 @@ - siginfo_t *pinfo; \ - void *puc; \ - siginfo_t info; \ -- struct ucontext uc; \ -+ struct ucontext_t uc; \ - } *rt_ = (CONTEXT)->cfa; \ - sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ - } \ diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild index 5023f2aaed91..65b417750fcd 100644 --- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild +++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=0 @@ -18,6 +18,8 @@ transform_known_flags() { replace-cpu-flags G3 750 replace-cpu-flags G4 7400 replace-cpu-flags G5 7400 + + filter-flags -fdiagnostics-show-option } is_arch_allowed() { @@ -111,7 +113,7 @@ do_filter_flags() { strip-flags } -PATCH_VER="1.9" +PATCH_VER="1.10" DESCRIPTION="Compatibility package for binaries linked against a pre gcc 3.4 libstdc++" HOMEPAGE="https://gcc.gnu.org/libstdc++/" @@ -133,9 +135,6 @@ src_unpack() { cd "${S}" EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch - # bug 637608 - has_version '>=sys-libs/glibc-2.26' && epatch "${FILESDIR}/${P}-glibc226.patch" - elibtoolize --portage --shallow ./contrib/gcc_update --touch mkdir -p "${WORKDIR}"/build |