From 323e9cf9f5c1dd2af649b1faed73142ad0f7c39a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 20 Mar 2014 16:36:28 +0100
Subject: [PATCH] xbps: stop building static bins with glibc; split xbps-static
 only for musl.

---
 srcpkgs/xbps-static          |  1 -
 srcpkgs/xbps-static/template | 38 ++++++++++++++++++++++++++++++++++++
 srcpkgs/xbps/template        | 11 +----------
 3 files changed, 39 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/xbps-static
 create mode 100644 srcpkgs/xbps-static/template

diff --git a/srcpkgs/xbps-static b/srcpkgs/xbps-static
deleted file mode 120000
index 9274d81bf02..00000000000
--- a/srcpkgs/xbps-static
+++ /dev/null
@@ -1 +0,0 @@
-xbps
\ No newline at end of file
diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
new file mode 100644
index 00000000000..efa14947f3f
--- /dev/null
+++ b/srcpkgs/xbps-static/template
@@ -0,0 +1,38 @@
+# Template file for 'xbps-static'
+#
+# NOTE: keep this package synchronized with "srcpkgs/xbps".
+pkgname=xbps-static
+version=0.33
+revision=4
+bootstrap=yes
+short_desc="The XBPS package system utilities - static binaries"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.voidlinux.eu/xbps"
+license="Simplified BSD"
+hostmakedepends="which pkg-config"
+makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2"
+depends="xbps-triggers"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686-musl) CFLAGS+=" -fno-stack-protector";;
+	*-musl) ;;
+	*) msg_error "${pkgname}-${version}: can only be built on musl targets.\n" ;;
+esac
+
+do_fetch() {
+	git clone -b${version} git://github.com/voidlinux/xbps.git ${pkgname}-${version}
+}
+
+do_configure() {
+	HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-debug
+}
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make DESTDIR=${wrksrc}/static-install install
+	vmkdir usr/sbin
+	mv ${wrksrc}/static-install/usr/sbin/*.static ${DESTDIR}/usr/sbin
+}
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index efb4c282b5c..a84efafde09 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -44,7 +44,7 @@ do_configure() {
 	if [ "$CHROOT_READY" ]; then
 		_args="--enable-tests"
 	fi
-	HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-debug ${_args}
+	HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-debug ${_args}
 }
 
 do_build() {
@@ -74,12 +74,3 @@ libxbps-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-xbps-static_package() {
-	depends="xbps-triggers"
-	short_desc+=" - static binaries"
-	replaces="xbps-static>=0"
-	pkg_install() {
-		vmove "usr/sbin/*.static"
-	}
-}