moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

cross-aarch64-linux-musl: use same lib64 approach as cross-aarch64-linux-gnu.

Browse source
This commit is contained in:
Christian Neukirchen 2016-09-18 19:14:05 +02:00
parent 5121c63c1b
commit 09fb11c1d5
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
srcpkgs/cross-aarch64-linux-musl/template
View file

@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet} pkgname=cross-${_triplet}
version=0.21 version=0.21
revision=6 revision=7
short_desc="Cross toolchain for ARM64 LE target (musl)" short_desc="Cross toolchain for ARM64 LE target (musl)"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.voidlinux.eu" homepage="http://www.voidlinux.eu"
@ -171,7 +171,7 @@ do_build() {
} }
do_install() { do_install() {
for f in include lib libexec bin sbin; do for f in include libexec bin sbin; do
if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then
mkdir -p ${DESTDIR}/${_sysroot}/usr/${f} mkdir -p ${DESTDIR}/${_sysroot}/usr/${f}
fi fi
@ -180,6 +180,10 @@ do_install() {
${DESTDIR}/${_sysroot}/${f} ${DESTDIR}/${_sysroot}/${f}
fi fi
done done
mkdir -p ${DESTDIR}/${_sysroot}/usr/lib
ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib64
ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib64
ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib
# install linux API headers # install linux API headers
cd ${wrksrc}/linux-${_linux_version} cd ${wrksrc}/linux-${_linux_version}
@ -206,12 +210,6 @@ do_install() {
# Make ld-musl.so symlinks relative. # Make ld-musl.so symlinks relative.
ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-aarch64.so.1 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 # Remove unnecessary stuff
rm -f ${DESTDIR}/usr/lib*/libiberty.a rm -f ${DESTDIR}/usr/lib*/libiberty.a
rm -rf ${DESTDIR}/usr/share rm -rf ${DESTDIR}/usr/share
@ -219,7 +217,7 @@ do_install() {
rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec} rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
rm -f ${DESTDIR}/${_sysroot}/libexec rm -f ${DESTDIR}/${_sysroot}/libexec
rm -f ${DESTDIR}/${_sysroot}/lib/*.py rm -f ${DESTDIR}/${_sysroot}/lib/*.py
rm -f ${DESTDIR}/${_sysroot}/{sbin,lib} rm -f ${DESTDIR}/${_sysroot}/sbin
} }
cross-aarch64-linux-musl-libc_package() { cross-aarch64-linux-musl-libc_package() {