| 1 |
commit: 2f46d10f3bd4f1887e6ffae7b616b67875e8ebf9 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 7 14:22:27 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 7 14:26:10 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f46d10f |
| 7 |
|
| 8 |
Revert "sys-libs/musl: back out of b94c385" |
| 9 |
|
| 10 |
This reverts commit d3b662a5b4d652def877bc1ee55086182ee1c7c6. |
| 11 |
|
| 12 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-libs/musl/musl-1.1.22.ebuild | 6 ++++++ |
| 15 |
sys-libs/musl/musl-1.1.23.ebuild | 6 ++++++ |
| 16 |
sys-libs/musl/musl-9999.ebuild | 6 ++++++ |
| 17 |
3 files changed, 18 insertions(+) |
| 18 |
|
| 19 |
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild |
| 20 |
index 7db3e1cc384..129c8302022 100644 |
| 21 |
--- a/sys-libs/musl/musl-1.1.22.ebuild |
| 22 |
+++ b/sys-libs/musl/musl-1.1.22.ebuild |
| 23 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 24 |
*) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 25 |
esac |
| 26 |
fi |
| 27 |
+ |
| 28 |
+ # fix for #667126, copied from glibc ebuild |
| 29 |
+ # make sure host make.conf doesn't pollute us |
| 30 |
+ if is_crosscompile || tc-is-cross-compiler ; then |
| 31 |
+ CHOST=${CTARGET} strip-unsupported-flags |
| 32 |
+ fi |
| 33 |
} |
| 34 |
|
| 35 |
src_configure() { |
| 36 |
|
| 37 |
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild |
| 38 |
index 455b845402c..19c1029a045 100644 |
| 39 |
--- a/sys-libs/musl/musl-1.1.23.ebuild |
| 40 |
+++ b/sys-libs/musl/musl-1.1.23.ebuild |
| 41 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 42 |
*) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 43 |
esac |
| 44 |
fi |
| 45 |
+ |
| 46 |
+ # fix for #667126, copied from glibc ebuild |
| 47 |
+ # make sure host make.conf doesn't pollute us |
| 48 |
+ if is_crosscompile || tc-is-cross-compiler ; then |
| 49 |
+ CHOST=${CTARGET} strip-unsupported-flags |
| 50 |
+ fi |
| 51 |
} |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
|
| 55 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
| 56 |
index 22f16fa8bfb..0827b9d412b 100644 |
| 57 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 58 |
+++ b/sys-libs/musl/musl-9999.ebuild |
| 59 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 60 |
*) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 61 |
esac |
| 62 |
fi |
| 63 |
+ |
| 64 |
+ # fix for #667126, copied from glibc ebuild |
| 65 |
+ # make sure host make.conf doesn't pollute us |
| 66 |
+ if is_crosscompile || tc-is-cross-compiler ; then |
| 67 |
+ CHOST=${CTARGET} strip-unsupported-flags |
| 68 |
+ fi |
| 69 |
} |
| 70 |
|
| 71 |
src_configure() { |
Archives