| 1 |
commit: 2c3bb292bd123f58758554c23f2d56acae081885 |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Mon Sep 2 16:43:53 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 3 11:18:32 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3bb292 |
| 7 |
|
| 8 |
sys-libs/musl: fix leaking of host cflags into cross-musl |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/667126 |
| 11 |
|
| 12 |
Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com> |
| 13 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-libs/musl/musl-1.1.20-r1.ebuild | 6 ++++++ |
| 16 |
sys-libs/musl/musl-1.1.21.ebuild | 6 ++++++ |
| 17 |
sys-libs/musl/musl-1.1.22.ebuild | 6 ++++++ |
| 18 |
sys-libs/musl/musl-1.1.23.ebuild | 6 ++++++ |
| 19 |
sys-libs/musl/musl-9999.ebuild | 6 ++++++ |
| 20 |
5 files changed, 30 insertions(+) |
| 21 |
|
| 22 |
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild |
| 23 |
index 13a18acc702..f53b3b492f0 100644 |
| 24 |
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild |
| 25 |
+++ b/sys-libs/musl/musl-1.1.20-r1.ebuild |
| 26 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 27 |
*) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 28 |
esac |
| 29 |
fi |
| 30 |
+ |
| 31 |
+ # fix for #667126, copied from glibc ebuild |
| 32 |
+ # make sure host make.conf doesn't pollute us |
| 33 |
+ if is_crosscompile || tc-is-cross-compiler ; then |
| 34 |
+ CHOST=${CTARGET} strip-unsupported-flags |
| 35 |
+ fi |
| 36 |
} |
| 37 |
|
| 38 |
src_prepare() { |
| 39 |
|
| 40 |
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild |
| 41 |
index 7ce0d5e96bc..1f4e2584ce7 100644 |
| 42 |
--- a/sys-libs/musl/musl-1.1.21.ebuild |
| 43 |
+++ b/sys-libs/musl/musl-1.1.21.ebuild |
| 44 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 45 |
*) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 46 |
esac |
| 47 |
fi |
| 48 |
+ |
| 49 |
+ # fix for #667126, copied from glibc ebuild |
| 50 |
+ # make sure host make.conf doesn't pollute us |
| 51 |
+ if is_crosscompile || tc-is-cross-compiler ; then |
| 52 |
+ CHOST=${CTARGET} strip-unsupported-flags |
| 53 |
+ fi |
| 54 |
} |
| 55 |
|
| 56 |
src_configure() { |
| 57 |
|
| 58 |
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild |
| 59 |
index 7db3e1cc384..129c8302022 100644 |
| 60 |
--- a/sys-libs/musl/musl-1.1.22.ebuild |
| 61 |
+++ b/sys-libs/musl/musl-1.1.22.ebuild |
| 62 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 63 |
*) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 64 |
esac |
| 65 |
fi |
| 66 |
+ |
| 67 |
+ # fix for #667126, copied from glibc ebuild |
| 68 |
+ # make sure host make.conf doesn't pollute us |
| 69 |
+ if is_crosscompile || tc-is-cross-compiler ; then |
| 70 |
+ CHOST=${CTARGET} strip-unsupported-flags |
| 71 |
+ fi |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
|
| 76 |
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild |
| 77 |
index 22f16fa8bfb..0827b9d412b 100644 |
| 78 |
--- a/sys-libs/musl/musl-1.1.23.ebuild |
| 79 |
+++ b/sys-libs/musl/musl-1.1.23.ebuild |
| 80 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 81 |
*) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 82 |
esac |
| 83 |
fi |
| 84 |
+ |
| 85 |
+ # fix for #667126, copied from glibc ebuild |
| 86 |
+ # make sure host make.conf doesn't pollute us |
| 87 |
+ if is_crosscompile || tc-is-cross-compiler ; then |
| 88 |
+ CHOST=${CTARGET} strip-unsupported-flags |
| 89 |
+ fi |
| 90 |
} |
| 91 |
|
| 92 |
src_configure() { |
| 93 |
|
| 94 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
| 95 |
index 22f16fa8bfb..0827b9d412b 100644 |
| 96 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 97 |
+++ b/sys-libs/musl/musl-9999.ebuild |
| 98 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 99 |
*) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 100 |
esac |
| 101 |
fi |
| 102 |
+ |
| 103 |
+ # fix for #667126, copied from glibc ebuild |
| 104 |
+ # make sure host make.conf doesn't pollute us |
| 105 |
+ if is_crosscompile || tc-is-cross-compiler ; then |
| 106 |
+ CHOST=${CTARGET} strip-unsupported-flags |
| 107 |
+ fi |
| 108 |
} |
| 109 |
|
| 110 |
src_configure() { |
Archives