diff options
| author |   stefson <herrtimson@yahoo.de> | 2019-09-02 18:43:53 +0200 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2019-09-03 07:18:32 -0400 |
| commit | 2c3bb292bd123f58758554c23f2d56acae081885 (patch) | |
| tree | 63ebb57783d8a5a932f59c84ae697b48d443f18a | |
| parent | dev-ruby/rdoc: amd64 stable wrt bug #693358 (diff) | |
| download | gentoo-2c3bb292bd123f58758554c23f2d56acae081885.tar.gz gentoo-2c3bb292bd123f58758554c23f2d56acae081885.tar.bz2 gentoo-2c3bb292bd123f58758554c23f2d56acae081885.zip | |
sys-libs/musl: fix leaking of host cflags into cross-musl
Closes: https://bugs.gentoo.org/667126
Signed-off-by: Steffen Kuhn <nielson2@yandex.com>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | sys-libs/musl/musl-1.1.20-r1.ebuild | 6 | ||||
| -rw-r--r-- | sys-libs/musl/musl-1.1.21.ebuild | 6 | ||||
| -rw-r--r-- | sys-libs/musl/musl-1.1.22.ebuild | 6 | ||||
| -rw-r--r-- | sys-libs/musl/musl-1.1.23.ebuild | 6 | ||||
| -rw-r--r-- | sys-libs/musl/musl-9999.ebuild | 6 |
5 files changed, 30 insertions, 0 deletions
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild index 13a18acc7023..f53b3b492f0a 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 7ce0d5e96bc4..1f4e2584ce79 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 7db3e1cc384e..129c83020221 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 22f16fa8bfb0..0827b9d412bf 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 22f16fa8bfb0..0827b9d412bf 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() { |