From b0085f8a1e84bdd70dee19d91de7f4db85393cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 16 Dec 2017 17:21:57 +0100 Subject: [PATCH] cross-x86_64-linux-musl: symlink shared libraries Closes #6313 #6303 --- srcpkgs/cross-x86_64-linux-musl/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index ca7cdacad47..ab56c9bc2f1 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.24 -revision=2 +revision=3 short_desc="Cross toolchain for x86_64 with musl" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -84,6 +84,9 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch + sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 + sed -i 's/lib64/lib/' gcc/config/i386/linux64.h + msg_normal "Building cross gcc bootstrap\n" [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap @@ -247,11 +250,6 @@ do_install() { cd ${DESTDIR}/${_sysroot}/usr/lib ln -sf libc.so ld-musl-x86_64.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