From 329479d8d6f0fe4d0da795e23fd05b46fd196ad1 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sun, 18 Sep 2016 16:24:48 +0200 Subject: [PATCH] cross-aarch64-linux-musl: move /usr/lib64 to /usr/lib. --- srcpkgs/cross-aarch64-linux-musl/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index 6a8eb37809..64e6c76444 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.21 -revision=5 +revision=6 short_desc="Cross toolchain for ARM64 LE target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -206,6 +206,12 @@ do_install() { # Make ld-musl.so symlinks relative. ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-aarch64.so.1 + # Move files to /usr/lib (lib64). + if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then + mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/ + rmdir ${DESTDIR}/${_sysroot}/usr/lib64 + fi + # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -rf ${DESTDIR}/usr/share