| 1 |
commit: 64245e628af8de13c9782c36088a000bd645ada7 |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Fri Apr 27 05:01:43 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 27 10:32:31 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=64245e62 |
| 7 |
|
| 8 |
dev-util/cargo: fix CHOST detection for arm and 17.0 profiles |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/cargo/cargo-0.22.0-r1.ebuild | 4 ++-- |
| 13 |
dev-util/cargo/cargo-0.23.0.ebuild | 4 ++-- |
| 14 |
dev-util/cargo/cargo-0.24.0.ebuild | 4 ++-- |
| 15 |
3 files changed, 6 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/cargo/cargo-0.22.0-r1.ebuild b/dev-util/cargo/cargo-0.22.0-r1.ebuild |
| 18 |
index db6da09..d1b7509 100644 |
| 19 |
--- a/dev-util/cargo/cargo-0.22.0-r1.ebuild |
| 20 |
+++ b/dev-util/cargo/cargo-0.22.0-r1.ebuild |
| 21 |
@@ -124,7 +124,7 @@ ws2_32-sys-0.2.1 |
| 22 |
inherit bash-completion-r1 cargo versionator |
| 23 |
|
| 24 |
case "${CHOST}" in |
| 25 |
- armv7a-hardfloat-*) |
| 26 |
+ armv7a*) |
| 27 |
CARGOARCH=armv7 ;; |
| 28 |
arm*) |
| 29 |
CARGOARCH=arm ;; |
| 30 |
@@ -135,7 +135,7 @@ case "${CHOST}" in |
| 31 |
armv7a-hardfloat-*) |
| 32 |
CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; |
| 33 |
arm*) |
| 34 |
- CARGOLIBC=${ELIBC/glibc/gnu}eabi ;; |
| 35 |
+ CARGOLIBC=${CHOST##*-} ;; |
| 36 |
*) |
| 37 |
CARGOLIBC=${ELIBC/glibc/gnu} ;; |
| 38 |
esac |
| 39 |
|
| 40 |
diff --git a/dev-util/cargo/cargo-0.23.0.ebuild b/dev-util/cargo/cargo-0.23.0.ebuild |
| 41 |
index 73a3fe3..e223913 100644 |
| 42 |
--- a/dev-util/cargo/cargo-0.23.0.ebuild |
| 43 |
+++ b/dev-util/cargo/cargo-0.23.0.ebuild |
| 44 |
@@ -131,7 +131,7 @@ ws2_32-sys-0.2.1 |
| 45 |
inherit bash-completion-r1 cargo versionator |
| 46 |
|
| 47 |
case "${CHOST}" in |
| 48 |
- armv7a-hardfloat-*) |
| 49 |
+ armv7a*) |
| 50 |
CARGOARCH=armv7 ;; |
| 51 |
arm*) |
| 52 |
CARGOARCH=arm ;; |
| 53 |
@@ -142,7 +142,7 @@ case "${CHOST}" in |
| 54 |
armv7a-hardfloat-*) |
| 55 |
CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; |
| 56 |
arm*) |
| 57 |
- CARGOLIBC=${ELIBC/glibc/gnu}eabi ;; |
| 58 |
+ CARGOLIBC=${CHOST##*-} ;; |
| 59 |
*) |
| 60 |
CARGOLIBC=${ELIBC/glibc/gnu} ;; |
| 61 |
esac |
| 62 |
|
| 63 |
diff --git a/dev-util/cargo/cargo-0.24.0.ebuild b/dev-util/cargo/cargo-0.24.0.ebuild |
| 64 |
index 89f6a7f..14d6057 100644 |
| 65 |
--- a/dev-util/cargo/cargo-0.24.0.ebuild |
| 66 |
+++ b/dev-util/cargo/cargo-0.24.0.ebuild |
| 67 |
@@ -135,7 +135,7 @@ ws2_32-sys-0.2.1 |
| 68 |
inherit bash-completion-r1 cargo versionator |
| 69 |
|
| 70 |
case "${CHOST}" in |
| 71 |
- armv7a-hardfloat-*) |
| 72 |
+ armv7a*) |
| 73 |
CARGOARCH=armv7 ;; |
| 74 |
arm*) |
| 75 |
CARGOARCH=arm ;; |
| 76 |
@@ -146,7 +146,7 @@ case "${CHOST}" in |
| 77 |
armv7a-hardfloat-*) |
| 78 |
CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; |
| 79 |
arm*) |
| 80 |
- CARGOLIBC=${ELIBC/glibc/gnu}eabi ;; |
| 81 |
+ CARGOLIBC=${CHOST##*-} ;; |
| 82 |
*) |
| 83 |
CARGOLIBC=${ELIBC/glibc/gnu} ;; |
| 84 |
esac |
Archives