| 1 |
commit: 83d4a0d2f242693aeac13f8333b8e9f6033ed972 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 2 21:28:22 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 2 21:29:17 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d4a0d2 |
| 7 |
|
| 8 |
sys-libs/libstdc++-v3: bump 1.10 patchset |
| 9 |
|
| 10 |
Reported-by: jms |
| 11 |
Closes: https://bugs.gentoo.org/665768 |
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 14 |
|
| 15 |
sys-libs/libstdc++-v3/Manifest | 2 +- |
| 16 |
.../files/libstdc++-v3-3.3.6-glibc226.patch | 33 ---------------------- |
| 17 |
sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild | 9 +++--- |
| 18 |
3 files changed, 5 insertions(+), 39 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest |
| 21 |
index 4e999dbedd2..816a3df55a0 100644 |
| 22 |
--- a/sys-libs/libstdc++-v3/Manifest |
| 23 |
+++ b/sys-libs/libstdc++-v3/Manifest |
| 24 |
@@ -1,2 +1,2 @@ |
| 25 |
-DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c |
| 26 |
+DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a |
| 27 |
DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed |
| 28 |
|
| 29 |
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 |
| 30 |
deleted file mode 100644 |
| 31 |
index a444da2d2bf..00000000000 |
| 32 |
--- a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,33 +0,0 @@ |
| 35 |
-diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux.h gcc-3.3.6/gcc/config/i386/linux.h |
| 36 |
---- gcc-3.3.6.orig/gcc/config/i386/linux.h 2018-01-01 20:14:36.311860098 +0100 |
| 37 |
-+++ gcc-3.3.6/gcc/config/i386/linux.h 2018-01-01 20:16:05.912287579 +0100 |
| 38 |
-@@ -261,7 +261,7 @@ |
| 39 |
- siginfo_t *pinfo; \ |
| 40 |
- void *puc; \ |
| 41 |
- siginfo_t info; \ |
| 42 |
-- struct ucontext uc; \ |
| 43 |
-+ struct ucontext_t uc; \ |
| 44 |
- } *rt_ = (CONTEXT)->cfa; \ |
| 45 |
- sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ |
| 46 |
- } \ |
| 47 |
-diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux64.h gcc-3.3.6/gcc/config/i386/linux64.h |
| 48 |
---- gcc-3.3.6.orig/gcc/config/i386/linux64.h 2018-01-01 20:14:36.271859907 +0100 |
| 49 |
-+++ gcc-3.3.6/gcc/config/i386/linux64.h 2018-01-01 20:16:05.912287579 +0100 |
| 50 |
-@@ -112,7 +112,7 @@ |
| 51 |
- if (*(unsigned char *)(pc_+0) == 0x48 \ |
| 52 |
- && *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7) \ |
| 53 |
- { \ |
| 54 |
-- struct ucontext *uc_ = (CONTEXT)->cfa; \ |
| 55 |
-+ struct ucontext_t *uc_ = (CONTEXT)->cfa; \ |
| 56 |
- sc_ = (struct sigcontext *) &uc_->uc_mcontext; \ |
| 57 |
- } \ |
| 58 |
- else \ |
| 59 |
-@@ -182,7 +182,7 @@ |
| 60 |
- siginfo_t *pinfo; \ |
| 61 |
- void *puc; \ |
| 62 |
- siginfo_t info; \ |
| 63 |
-- struct ucontext uc; \ |
| 64 |
-+ struct ucontext_t uc; \ |
| 65 |
- } *rt_ = (CONTEXT)->cfa; \ |
| 66 |
- sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ |
| 67 |
- } \ |
| 68 |
|
| 69 |
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 |
| 70 |
index 5023f2aaed9..65b417750fc 100644 |
| 71 |
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild |
| 72 |
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild |
| 73 |
@@ -1,4 +1,4 @@ |
| 74 |
-# Copyright 1999-2018 Gentoo Foundation |
| 75 |
+# Copyright 1999-2018 Gentoo Authors |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
|
| 78 |
EAPI=0 |
| 79 |
@@ -18,6 +18,8 @@ transform_known_flags() { |
| 80 |
replace-cpu-flags G3 750 |
| 81 |
replace-cpu-flags G4 7400 |
| 82 |
replace-cpu-flags G5 7400 |
| 83 |
+ |
| 84 |
+ filter-flags -fdiagnostics-show-option |
| 85 |
} |
| 86 |
|
| 87 |
is_arch_allowed() { |
| 88 |
@@ -111,7 +113,7 @@ do_filter_flags() { |
| 89 |
strip-flags |
| 90 |
} |
| 91 |
|
| 92 |
-PATCH_VER="1.9" |
| 93 |
+PATCH_VER="1.10" |
| 94 |
|
| 95 |
DESCRIPTION="Compatibility package for binaries linked against a pre gcc 3.4 libstdc++" |
| 96 |
HOMEPAGE="https://gcc.gnu.org/libstdc++/" |
| 97 |
@@ -133,9 +135,6 @@ src_unpack() { |
| 98 |
cd "${S}" |
| 99 |
EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch |
| 100 |
|
| 101 |
- # bug 637608 |
| 102 |
- has_version '>=sys-libs/glibc-2.26' && epatch "${FILESDIR}/${P}-glibc226.patch" |
| 103 |
- |
| 104 |
elibtoolize --portage --shallow |
| 105 |
./contrib/gcc_update --touch |
| 106 |
mkdir -p "${WORKDIR}"/build |
Archives