diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template index aae12f4f4bf..2aa25fee247 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.29 +version=0.30 revision=1 build_style=meta short_desc="Dummy meta-pkg for cross building packages with xbps-src" @@ -10,10 +10,6 @@ homepage="https://www.voidlinux.org/" depends="base-files>=0.126" -case "$XBPS_TARGET_MACHINE" in - *-musl) depends+=" musl-legacy-compat";; -esac - provides=" kernel-libc-headers-9999_1 binutils-9999_1 @@ -28,10 +24,7 @@ provides=" libgomp-devel-9999_1 gcc-9999_1 gcc-fortran-9999_1 - gcc-ada-9999_1 - glibc-9999_1 - glibc-devel-9999_1 - musl-9999_1" + gcc-ada-9999_1" conflicts=" kernel-libc-headers>=0 binutils>=0 @@ -46,31 +39,29 @@ conflicts=" libgomp-devel>=0 gcc>=0 gcc-fortran>=0 - gcc-ada>=0 - glibc>=0 - glibc-devel>=0 - musl>=0" + gcc-ada>=0" shlib_provides=" - libc.so - libc.so.6 - libm.so.6 - librt.so.1 - libpthread.so.0 - libcrypt.so.1 - libdl.so.2 - libresolv.so.2 - libnsl.so.1 - libutil.so.1 libgcc_s.so.1 libgnat-8.so libgnarl-8.so libgomp.so.1 libstdc++.so.6 - libgfortran.so.5 - ld.so.1 - ld-linux.so.2 - ld-linux.so.3 - ld-linux-x86_64.so.2 - ld-linux-armhf.so.3 - ld-linux-aarch64.so.1 - ld64.so.2" + libgfortran.so.5" + +case "$XBPS_TARGET_MACHINE" in +*-musl) depends+=" musl-legacy-compat" + provides+=" musl-9999_1 musl-devel-9999_1" + conflicts+=" musl>=0" + shlib_provides+=" libc.so" + ;; +# glibc +*) 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" + shlib_provides+=" libnsl.so.1 libutil.so.1" + 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