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 95405139083 for ; Fri, 15 Dec 2017 00:16:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF41EE0F35; Fri, 15 Dec 2017 00:16:12 +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 8AEF0E0F35 for ; Fri, 15 Dec 2017 00:16:12 +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 D3E0633BE68 for ; Fri, 15 Dec 2017 00:16:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D25BAE1D for ; Fri, 15 Dec 2017 00:16:09 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1513291567.bb8bb503cc28b1cf57bbc2b8a16b0f735f6e1b3b.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-devel/gcc/ X-VCS-Repository: proj/musl X-VCS-Files: sys-devel/gcc/gcc-4.9.4-r100.ebuild sys-devel/gcc/gcc-4.9.4-r99.ebuild sys-devel/gcc/gcc-5.4.0-r3.ebuild sys-devel/gcc/gcc-6.4.0.ebuild sys-devel/gcc/gcc-7.2.0.ebuild X-VCS-Directories: sys-devel/gcc/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: bb8bb503cc28b1cf57bbc2b8a16b0f735f6e1b3b X-VCS-Branch: master Date: Fri, 15 Dec 2017 00:16:09 +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: ddedd392-8ed5-45b7-9f8e-93cdc8e16eb7 X-Archives-Hash: 8941256cbb95815868505bb59baa5d69 commit: bb8bb503cc28b1cf57bbc2b8a16b0f735f6e1b3b Author: Dave Flogeras gmail com> AuthorDate: Thu Dec 14 22:46:07 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Thu Dec 14 22:46:07 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bb8bb503 Widen toolchain stanza when cross-compiling for those with -musleabi sys-devel/gcc/gcc-4.9.4-r100.ebuild | 2 +- sys-devel/gcc/gcc-4.9.4-r99.ebuild | 2 +- sys-devel/gcc/gcc-5.4.0-r3.ebuild | 2 +- sys-devel/gcc/gcc-6.4.0.ebuild | 2 +- sys-devel/gcc/gcc-7.2.0.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-devel/gcc/gcc-4.9.4-r100.ebuild b/sys-devel/gcc/gcc-4.9.4-r100.ebuild index a307fbd..8ebef29 100644 --- a/sys-devel/gcc/gcc-4.9.4-r100.ebuild +++ b/sys-devel/gcc/gcc-4.9.4-r100.ebuild @@ -43,7 +43,7 @@ src_prepare() { toolchain_src_prepare - if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then cd "${S}" sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org diff --git a/sys-devel/gcc/gcc-4.9.4-r99.ebuild b/sys-devel/gcc/gcc-4.9.4-r99.ebuild index 4fdb806..a65bc67 100644 --- a/sys-devel/gcc/gcc-4.9.4-r99.ebuild +++ b/sys-devel/gcc/gcc-4.9.4-r99.ebuild @@ -43,7 +43,7 @@ src_prepare() { toolchain_src_prepare - if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then cd "${S}" sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org diff --git a/sys-devel/gcc/gcc-5.4.0-r3.ebuild b/sys-devel/gcc/gcc-5.4.0-r3.ebuild index f147ac9..91ec961 100644 --- a/sys-devel/gcc/gcc-5.4.0-r3.ebuild +++ b/sys-devel/gcc/gcc-5.4.0-r3.ebuild @@ -50,7 +50,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch epatch "${FILESDIR}"/${PN}-5.4.0-pr71696-CVE-2016-6131.patch - if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then epatch "${FILESDIR}"/4.9.4/gthread.patch epatch "${FILESDIR}"/4.9.4/boehm_gc.patch epatch "${FILESDIR}"/4.9.4/posix_memalign.patch diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild index dd3ca69..b254f9f 100644 --- a/sys-devel/gcc/gcc-6.4.0.ebuild +++ b/sys-devel/gcc/gcc-6.4.0.ebuild @@ -25,7 +25,7 @@ src_prepare() { # Upstream Patch epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch - if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then epatch "${FILESDIR}"/4.9.4/boehm_gc.patch epatch "${FILESDIR}"/5.4.0/cilkrts.patch epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch diff --git a/sys-devel/gcc/gcc-7.2.0.ebuild b/sys-devel/gcc/gcc-7.2.0.ebuild index 035e93f..257a2d2 100644 --- a/sys-devel/gcc/gcc-7.2.0.ebuild +++ b/sys-devel/gcc/gcc-7.2.0.ebuild @@ -25,7 +25,7 @@ src_prepare() { epatch "${FILESDIR}"/gcc-7.2.0-pr69728.patch - if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch epatch "${FILESDIR}"/7.1.0/posix_memalign.patch fi