cross-*-linux-musl*: do not remove gcc's stddef.h.

It's necessary when cross compiling with -nostdinc.
Piraty · May 26, 2015 · 224951e · 224951e
1 parent 89c4564
commit 224951e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git 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 <xtraeme@voidlinux.eu>"
 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
@@ -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 <xtraeme@voidlinux.eu>"
 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
@@ -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 <xtraeme@voidlinux.eu>"
 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
@@ -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 <xtraeme@voidlinux.eu>"
 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