From 224951e9dd7820f31ffce0fbe853e860bb37accc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 26 May 2015 08:25:46 +0200 Subject: [PATCH] cross-*-linux-musl*: do not remove gcc's stddef.h. It's necessary when cross compiling with -nostdinc. --- srcpkgs/cross-arm-linux-musleabihf/template | 5 ++--- srcpkgs/cross-armv7l-linux-musleabihf/template | 5 ++--- srcpkgs/cross-i686-linux-musl/template | 5 ++--- srcpkgs/cross-x86_64-linux-musl/template | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template index 2105be2c83..9c4e39400c 100644 --- a/srcpkgs/cross-arm-linux-musleabihf/template +++ b/srcpkgs/cross-arm-linux-musleabihf/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.17 -revision=1 +revision=2 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -193,8 +193,7 @@ do_install() { make DESTDIR=${DESTDIR}/${_sysroot} install # Remove useless headers. - rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \ - ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ # Make ld-musl-armhf.so.1 symlink relative. ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-armhf.so.1 diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index b923b97610..b78c73a11c 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.17 -revision=1 +revision=2 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -193,8 +193,7 @@ do_install() { make DESTDIR=${DESTDIR}/${_sysroot} install # Remove useless headers. - rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \ - ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ # Make ld-musl-armhf.so.1 symlink relative. ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-armhf.so.1 diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 474a850718..47d98f7512 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -11,7 +11,7 @@ _archflags="-march=i686" pkgname=cross-${_triplet} version=0.17 -revision=2 +revision=3 short_desc="Cross toolchain for i686 target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -192,8 +192,7 @@ do_install() { make DESTDIR=${DESTDIR}/${_sysroot} install # Remove useless headers. - rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \ - ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ # Make ld-musl-i386.so.1 symlink relative to cwd. cd ${DESTDIR}/${_sysroot}/usr/lib diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index d1ff451cca..942ee499df 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.17 -revision=1 +revision=2 short_desc="Cross toolchain for x86_64 with musl" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -191,8 +191,7 @@ do_install() { make DESTDIR=${DESTDIR}/${_sysroot} install # Remove useless headers. - rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \ - ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ # Make ld-musl-x86_64.so.1 symlink relative to cwd. cd ${DESTDIR}/${_sysroot}/usr/lib