From f8935bcc60a798e6c7aa16dfbc2e3812fdc4785d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 15:30:06 -0300
Subject: [PATCH 1/2] 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 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a6a49ff3d05..165936da55c 100644
--- a/srcpkgs/musl/template
+++ b/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,23 +25,24 @@ 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
 	vmkdir usr/bin
 	ln -s ../lib${XBPS_TARGET_WORDSIZE}/libc.so ${DESTDIR}/usr/bin/ldd
+
 	# additional utils from Alpine/NetBSD
 	vbin iconv
 	vbin getent
 	vman ${FILESDIR}/getent.1
 	vbin getconf
 	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 +51,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"
 	}
 }

From b140101988da7af8080437e75183b5a303c0a711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 15:33:52 -0300
Subject: [PATCH 2/2] xbps: add architecture file for all archs.

This adds the musl-arch.conf file that was previously contained in the
musl package. No need to special case musl, so add it for all archs.
---
 srcpkgs/xbps/template | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 66deab88d1b..039ecea6310 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=2
+revision=3
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -33,21 +33,27 @@ fi
 do_configure() {
 	./configure --prefix=/usr --sysconfdir=/etc ${CHROOT_READY:+--enable-tests}
 }
+
 post_install() {
+	local _repo="repository=https://alpha.de.repo.voidlinux.org"
 	case "$XBPS_TARGET_MACHINE" in
 	aarch64*) # XXX different repo location
-		echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64" > \
+		echo "${_repo}/current/aarch64" > \
 			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
 		;;
 	*-musl) # XXX different repo location
-		echo "repository=https://alpha.de.repo.voidlinux.org/current/musl" > \
+		echo "${_repo}/current/musl" > \
 			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
 		;;
 	*)
-		echo "repository=https://alpha.de.repo.voidlinux.org/current" > \
+		echo "${_repo}/current" > \
 			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
 		;;
 	esac
+
+	echo "architecture=${XBPS_TARGET_MACHINE}" > \
+		${DESTDIR}/usr/share/xbps.d/xbps-arch.conf
+
 	vlicense LICENSE
 	vlicense LICENSE.3RDPARTY
 }
@@ -58,6 +64,7 @@ libxbps_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+
 libxbps-devel_package() {
 	short_desc+=" - runtime library (development files)"
 	depends="${makedepends} libxbps>=${version}_${revision}"