From 467c240aeec953c00818f6e51e11dbf3e7cd44b9 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 30 Oct 2018 15:21:17 -0400 Subject: [PATCH] hybris: Correct the musl runtime linker config file name for armhf --- hybris/libhybris/APKBUILD | 2 +- hybris/libhybris/libhybris-egl.post-install | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hybris/libhybris/APKBUILD b/hybris/libhybris/APKBUILD index 7809161e0..d51fa4384 100644 --- a/hybris/libhybris/APKBUILD +++ b/hybris/libhybris/APKBUILD @@ -1,6 +1,6 @@ pkgname=libhybris pkgver=1.0_git20180212 -pkgrel=2 +pkgrel=3 arch="x86 armhf aarch64" url="https://github.com/libhybris/libhybris" license="Apache" diff --git a/hybris/libhybris/libhybris-egl.post-install b/hybris/libhybris/libhybris-egl.post-install index 7aba24250..901809726 100644 --- a/hybris/libhybris/libhybris-egl.post-install +++ b/hybris/libhybris/libhybris-egl.post-install @@ -1,5 +1,14 @@ #!/bin/sh -ARCH=$(uname -m) +KARCH=$(uname -m) + +case "$KARCH" in + armv7l) + ARCH=armhf + ;; + *) + ARCH="$KARCH" + ;; +esac if [ ! -f /etc/ld-musl-$ARCH.path ]; then echo "/usr/lib/libhybris-egl:/lib:/usr/local/lib:/usr/lib" > /etc/ld-musl-$ARCH.path