musl: remove repository config file and clean up.

- musl doesn't need kernel-libc-headers in order to be built
- no need to conflict with glibc, since it can't be built for *-musl
targets
- the repository config file will be created in xbps instead, but it
isn't even truly needed, since XBPS "knows" when it was built for musl

srcpkgs/musl/template

@@ -2,19 +2,17 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=5
+revision=6
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--prefix=/usr --disable-gcc-wrapper"
-makedepends="kernel-libc-headers"
 short_desc="Musl C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
-conflicts="glibc>=0"
 
 nostrip_files="libc.so"
 shlib_provides="libc.so"
@@ -27,7 +25,7 @@ post_build() {
 do_install() {
 	# Move everything to /usr.
 	vmkdir usr/lib
-	ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/lib
+	ln -s usr/lib ${DESTDIR}/lib
 	make DESTDIR=${DESTDIR} install
 	rm ${DESTDIR}/lib
 	# provide ldd
@@ -41,9 +39,7 @@ do_install() {
 	vman ${FILESDIR}/getconf.1
 	# Fake ldconfig
 	ln -s true ${DESTDIR}/usr/bin/ldconfig
-	# Create xbps.d(5) arch override file
-	vmkdir usr/share/xbps.d
-	echo "architecture=${XBPS_TARGET_MACHINE}" > ${DESTDIR}/usr/share/xbps.d/musl-arch.conf
+
 	vlicense COPYRIGHT
 }
 
@@ -52,7 +48,7 @@ musl-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.o
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.o"
 	}
 }