From 1de631ca6fab78a7e2410c6e6ecdce0cd32df40e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 21:33:21 +0100
Subject: [PATCH] cross-vpkg-dummy: update for gcc10, add libssp for musl

also build always, since there is no point in restricting this
only to crosstargets (it will avoid annoyingly rebuilding the
package locally)
---
 srcpkgs/cross-vpkg-dummy/template | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index e2a08d2404..b7347d0351 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,6 +1,6 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
-version=0.35
+version=0.36
 revision=1
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
@@ -54,18 +54,19 @@ conflicts="
 	gcc-objc++>=0"
 shlib_provides="
 	libgcc_s.so.1
-	libgnat-9.so
-	libgnarl-9.so
+	libgnat-10.so
+	libgnarl-10.so
 	libstdc++.so.6
 	libgfortran.so.5"
 
-case "$XBPS_TARGET_MACHINE" in
-*-musl) provides+=" musl-9999_1 musl-devel-9999_1"
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	provides+=" musl-9999_1 musl-devel-9999_1"
+	# bundled in musl crosstoolchains but not glibc
+	provides+=" libssp-9999_1 libssp-devel-9999_1"
 	conflicts+=" musl>=0"
 	shlib_provides+=" libc.so"
-	;;
-# glibc
-*)	provides+=" glibc-9999_1 glibc-devel-9999_1"
+else
+	provides+=" glibc-9999_1 glibc-devel-9999_1"
 	conflicts+=" glibc>=0"
 	shlib_provides+=" libc.so.6 libm.so.6 librt.so.1 libpthread.so.0"
 	shlib_provides+=" libcrypt.so.1 libdl.so.2 libresolv.so.2"
@@ -73,9 +74,4 @@ case "$XBPS_TARGET_MACHINE" in
 	shlib_provides+=" ld-linux.so.2 ld-linux.so.3 ld-linux-x86_64.so.2"
 	shlib_provides+=" ld-linux-armhf.so.3 ld-linux-aarch64.so.1"
 	shlib_provides+=" ld64.so.2 ld.so.1"
-	;;
-esac
-
-if [ -z "$XBPS_CROSS_BUILD" ]; then
-	broken="This package is only meant to be used by xbps-src to cross compile."
 fi