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 030D6138334 for ; Sat, 7 Sep 2019 14:26:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47788E0A4F; Sat, 7 Sep 2019 14:26:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 2CA83E0A4F for ; Sat, 7 Sep 2019 14:26:29 +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 2460534AE31 for ; Sat, 7 Sep 2019 14:26:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EF9271A for ; Sat, 7 Sep 2019 14:26:26 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1567866370.2f46d10f3bd4f1887e6ffae7b616b67875e8ebf9.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/musl/musl-1.1.22.ebuild sys-libs/musl/musl-1.1.23.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 2f46d10f3bd4f1887e6ffae7b616b67875e8ebf9 X-VCS-Branch: master Date: Sat, 7 Sep 2019 14:26:26 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d332bfb1-c5f8-4619-ab34-a7d3558f0b60 X-Archives-Hash: 7c53386f6b8b8db74e341d29afa18e31 commit: 2f46d10f3bd4f1887e6ffae7b616b67875e8ebf9 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 7 14:22:27 2019 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 7 14:26:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f46d10f Revert "sys-libs/musl: back out of b94c385" This reverts commit d3b662a5b4d652def877bc1ee55086182ee1c7c6. Signed-off-by: Anthony G. Basile gentoo.org> sys-libs/musl/musl-1.1.22.ebuild | 6 ++++++ sys-libs/musl/musl-1.1.23.ebuild | 6 ++++++ sys-libs/musl/musl-9999.ebuild | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild index 7db3e1cc384..129c8302022 100644 --- a/sys-libs/musl/musl-1.1.22.ebuild +++ b/sys-libs/musl/musl-1.1.22.ebuild @@ -52,6 +52,12 @@ pkg_setup() { *) die "Use sys-devel/crossdev to build a musl toolchain" ;; esac fi + + # fix for #667126, copied from glibc ebuild + # make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi } src_configure() { diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild index 455b845402c..19c1029a045 100644 --- a/sys-libs/musl/musl-1.1.23.ebuild +++ b/sys-libs/musl/musl-1.1.23.ebuild @@ -52,6 +52,12 @@ pkg_setup() { *) die "Use sys-devel/crossdev to build a musl toolchain" ;; esac fi + + # fix for #667126, copied from glibc ebuild + # make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi } src_configure() { diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 22f16fa8bfb..0827b9d412b 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -52,6 +52,12 @@ pkg_setup() { *) die "Use sys-devel/crossdev to build a musl toolchain" ;; esac fi + + # fix for #667126, copied from glibc ebuild + # make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi } src_configure() {