From 1a69b79774829a6e8b83581d9f2751a5be402f46 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 10 Feb 2014 15:54:09 +0100 Subject: [PATCH] cross-x86_64-linux-musl: install linux API headers before musl to DESTDIR. ... otherwise some musl provided headers (scsi/sg.h) might be removed by this without any apparent reason. --- srcpkgs/cross-x86_64-linux-musl/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 266a721c48b..7fbf0233293 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -9,7 +9,7 @@ _triplet=x86_64-linux-musl _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.3 +version=0.4 revision=1 short_desc="Cross toolchain for the ${_triplet} target" maintainer="Juan RP " @@ -175,6 +175,12 @@ do_install() { fi done + # install linux API headers for x86 + cd ${wrksrc}/linux-${_linux_version} + make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_sysroot}/usr headers_install + rm -f $(find ${DESTDIR}/${_sysroot}/usr/include -name .install -or -name ..install.cmd) + rm -rf ${DESTDIR}/${_sysroot}/usr/include/drm + # install cross binutils cd ${wrksrc}/binutils-build make DESTDIR=${DESTDIR} install @@ -195,12 +201,6 @@ do_install() { cd ${DESTDIR}/${_sysroot}/usr/lib ln -sf libc.so ld-musl-x86_64.so.1 - # install linux API headers for x86 - cd ${wrksrc}/linux-${_linux_version} - make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_sysroot}/usr headers_install - rm -f $(find ${DESTDIR}/${_sysroot}/usr/include -name .install -or -name ..install.cmd) - rm -rf ${DESTDIR}/${_sysroot}/usr/include/drm - # Move files to /usr/lib (lib64). if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/