From a81946781a1e6706a6df84293f19206128727213 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Fri, 10 Apr 2020 17:47:52 +0200 Subject: [PATCH] cross/crossdirect: fix rust breakage (!1139) See: * https://gitlab.alpinelinux.org/alpine/aports/issues/11349 * https://gitlab.alpinelinux.org/alpine/aports/-/commit/7bb907ec23f7672218ff018e4fdefdea2048ac23 --- cross/crossdirect/APKBUILD | 4 ++-- cross/crossdirect/rustc.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cross/crossdirect/APKBUILD b/cross/crossdirect/APKBUILD index 734f95ed1..b4c42dfe5 100644 --- a/cross/crossdirect/APKBUILD +++ b/cross/crossdirect/APKBUILD @@ -17,7 +17,7 @@ pkgname=crossdirect pkgver=4 -pkgrel=0 +pkgrel=1 pkgdesc="Wrappers to launch native cross compilers in foreign chroots" url="https://postmarketOS.org" arch="all" @@ -78,5 +78,5 @@ package() { done } sha512sums="20b963322820de038257304c1eefa85767b78e242eda7459f06d70a1cfae5540a445aa7d5587024bf4d88a4bee28120ef9f5c2d24a648e71b542b9618318deb2 crossdirect.c -c3492cf2bbf282d22585fb485a8a8950ddbd6e47faff472931072defa9c33ea757b72d455b2d608304c7e40f9c736fac2b9101b65accd48ad896bc7055ef0436 rustc.sh +6be16ba88720e628a3ecc8fa53f8e7a21d2af268b0509745d989139874d6b94b640bfcff09575eaa19073810be6ef91169c1f83e94f5cf8e6819f2670d9408de rustc.sh ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b rust-qemu-linker.sh" diff --git a/cross/crossdirect/rustc.sh b/cross/crossdirect/rustc.sh index f3249077f..9402c727e 100644 --- a/cross/crossdirect/rustc.sh +++ b/cross/crossdirect/rustc.sh @@ -8,13 +8,13 @@ rust_triplet() { echo "x86_64-alpine-linux-musl" ;; armhf) - echo "arm-unknown-linux-musleabihf" + echo "armv6-alpine-linux-musleabihf" ;; armv7) - echo "armv7-unknown-linux-musleabihf" + echo "armv7-alpine-linux-musleabihf" ;; aarch64) - echo "aarch64-unknown-linux-musl" + echo "aarch64-alpine-linux-musl" ;; *) echo "ERROR: don't know the rust triple for $1!" >&2