tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

cross-x86_64-linux-musl: install linux API headers before musl to DESTDIR.

Browse Source 
... otherwise some musl provided headers (scsi/sg.h) might be removed
by this without any apparent reason.
This commit is contained in:
Juan RP 2014-02-10 15:54:09 +01:00
parent a45a496b17
commit 1a69b79774
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
srcpkgs/cross-x86_64-linux-musl/template
View File

@ -9,7 +9,7 @@ _triplet=x86_64-linux-musl
_sysroot="/usr/${_triplet}" _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet} pkgname=cross-${_triplet}
version=0.3 version=0.4
revision=1 revision=1
short_desc="Cross toolchain for the ${_triplet} target" short_desc="Cross toolchain for the ${_triplet} target"
maintainer="Juan RP <xtraeme@gmail.org>" maintainer="Juan RP <xtraeme@gmail.org>"
@ -175,6 +175,12 @@ do_install() {
fi fi
done 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 # install cross binutils
cd ${wrksrc}/binutils-build cd ${wrksrc}/binutils-build
make DESTDIR=${DESTDIR} install make DESTDIR=${DESTDIR} install
@ -195,12 +201,6 @@ do_install() {
cd ${DESTDIR}/${_sysroot}/usr/lib cd ${DESTDIR}/${_sysroot}/usr/lib
ln -sf libc.so ld-musl-x86_64.so.1 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). # Move files to /usr/lib (lib64).
if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then
mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/ mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/