[gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/

[Anthony G. Basile]

commit:     2f46d10f3bd4f1887e6ffae7b616b67875e8ebf9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 14:22:27 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> 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 <blueness <AT> 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() {