commit: 2c3bb292bd123f58758554c23f2d56acae081885 Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Mon Sep 2 16:43:53 2019 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Tue Sep 3 11:18:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3bb292
sys-libs/musl: fix leaking of host cflags into cross-musl Closes: https://bugs.gentoo.org/667126 Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> sys-libs/musl/musl-1.1.20-r1.ebuild | 6 ++++++ sys-libs/musl/musl-1.1.21.ebuild | 6 ++++++ 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 ++++++ 5 files changed, 30 insertions(+) diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild index 13a18acc702..f53b3b492f0 100644 --- a/sys-libs/musl/musl-1.1.20-r1.ebuild +++ b/sys-libs/musl/musl-1.1.20-r1.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_prepare() { diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild index 7ce0d5e96bc..1f4e2584ce7 100644 --- a/sys-libs/musl/musl-1.1.21.ebuild +++ b/sys-libs/musl/musl-1.1.21.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.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 22f16fa8bfb..0827b9d412b 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() {
