From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D6801138206 for ; Mon, 1 Jan 2018 20:45:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CDE7E0814; Mon, 1 Jan 2018 20:45:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4815E0814 for ; Mon, 1 Jan 2018 20:45:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C3F50335C08 for ; Mon, 1 Jan 2018 20:45:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17BC5147 for ; Mon, 1 Jan 2018 20:45:56 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1514839537.58ab932cf383aefaab66263f659429889152d569.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libstdc++-v3/files/, sys-libs/libstdc++-v3/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild X-VCS-Directories: sys-libs/libstdc++-v3/ sys-libs/libstdc++-v3/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 58ab932cf383aefaab66263f659429889152d569 X-VCS-Branch: master Date: Mon, 1 Jan 2018 20:45:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 09e894db-1b08-4948-a993-664cbc5d4055 X-Archives-Hash: a6d99809367f58b912fe549f5ef353ab commit: 58ab932cf383aefaab66263f659429889152d569 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Jan 1 20:44:53 2018 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Mon Jan 1 20:45:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ab932c sys-libs/libstdc++-v3: Fix build with glibc-2.26, bug 637608 We need to patch conditionally since the patch breaks the build with glibc-2.25. Closes: https://bugs.gentoo.org/637608 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../files/libstdc++-v3-3.3.6-glibc226.patch | 33 ++++++++++++++++++++++ sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..a444da2d2bf --- /dev/null +++ b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch @@ -0,0 +1,33 @@ +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 53ec501f081..c90cf870b49 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-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit eutils flag-o-matic libtool multilib @@ -130,6 +130,10 @@ src_unpack() { unpack ${A} 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