[PR PATCH] cross-vpkg-dummy: differentiate between musl and glibc.

[PR PATCH] cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 644 bytes --]

There is a new pull request by xtraeme against master on the void-packages repository

https://github.com/xtraeme/void-packages cross-vpkg-dummy-musl-vs-glibc
https://github.com/void-linux/void-packages/pull/12445

cross-vpkg-dummy: differentiate between musl and glibc.
A single pkg that provides musl and glibc and conflicts
with both, this is not a great idea.

Differentiate them to avoid issues like:

https://build.voidlinux.org/builders/armv6l-musl_builder/builds/19727/steps/shell_3/logs/stdio

Signed-off-by: Juan RP <xtraeme@gmail.com>

A patch file from https://github.com/void-linux/void-packages/pull/12445.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cross-vpkg-dummy-musl-vs-glibc-12445.patch --]
[-- Type: application/text/x-diff, Size: 2650 bytes --]

From 27d9144350f4e35f66d274a19c27b15e8e03325c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 13 Jun 2019 19:01:43 +0200
Subject: [PATCH] cross-vpkg-dummy: differentiate between musl and glibc.

A single pkg that provides musl and glibc and conflicts
with both, this is not a great idea.

Differentiate them to avoid issues like:

https://build.voidlinux.org/builders/armv6l-musl_builder/builds/19727/steps/shell_3/logs/stdio

Signed-off-by: Juan RP <xtraeme@gmail.com>
---
 srcpkgs/cross-vpkg-dummy/template | 53 +++++++++++++------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

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

Re: cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12445#issuecomment-501794023
Comment:
@pullmoll 

Re: cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/12445#issuecomment-501796679
Comment:
This is of course the way to go, i.e. depend on those packages which the libc etc. provides.

Re: cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12445#issuecomment-501797401
Comment:
@pullmoll yeah, I'm surprised this worked all this time! heh

Re: cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/12445#issuecomment-501798737
Comment:
I never thought much about it when adding the entries for the `cross*` sub-packages.

Re: cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/12445#issuecomment-501800197
Comment:
Can we merge this right away without interfering with libressl dependency updates?

Re: [PR PATCH] [Updated] cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

There is an updated pull request by xtraeme against master on the void-packages repository

https://github.com/xtraeme/void-packages cross-vpkg-dummy-musl-vs-glibc
https://github.com/void-linux/void-packages/pull/12445

cross-vpkg-dummy: differentiate between musl and glibc.
A single pkg that provides musl and glibc and conflicts
with both, this is not a great idea.

Differentiate them to avoid issues like:

https://build.voidlinux.org/builders/armv6l-musl_builder/builds/19727/steps/shell_3/logs/stdio

Signed-off-by: Juan RP <xtraeme@gmail.com>

A patch file from https://github.com/void-linux/void-packages/pull/12445.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cross-vpkg-dummy-musl-vs-glibc-12445.patch --]
[-- Type: application/text/x-diff, Size: 3836 bytes --]

From 27d9144350f4e35f66d274a19c27b15e8e03325c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 13 Jun 2019 19:01:43 +0200
Subject: [PATCH 1/2] cross-vpkg-dummy: differentiate between musl and glibc.

A single pkg that provides musl and glibc and conflicts
with both, this is not a great idea.

Differentiate them to avoid issues like:

https://build.voidlinux.org/builders/armv6l-musl_builder/builds/19727/steps/shell_3/logs/stdio

Signed-off-by: Juan RP <xtraeme@gmail.com>
---
 srcpkgs/cross-vpkg-dummy/template | 53 +++++++++++++------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

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

From 82e6c763a8a2d9c6574cf37d22caf22f1c4c8177 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 13 Jun 2019 19:29:23 +0200
Subject: [PATCH 2/2] xbps-src/cross.sh: require cross-vpkg-dummy>=0.30.

Signed-off-by: Juan RP <xtraeme@gmail.com>
---
 common/xbps-src/shutils/cross.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh
index 393dfb53010..83b7b66fa39 100644
--- a/common/xbps-src/shutils/cross.sh
+++ b/common/xbps-src/shutils/cross.sh
@@ -28,12 +28,12 @@ prepare_cross_sysroot() {
     [ -z "$cross" -o "$cross" = "" ] && return 0
 
     # Check for cross-vpkg-dummy available for the target arch, otherwise build it.
-    pkg_available cross-vpkg-dummy $cross
+    pkg_available 'cross-vpkg-dummy>=0.30_1' $cross
     if [ $? -eq 0 ]; then
         $XBPS_LIBEXECDIR/build.sh cross-vpkg-dummy cross-vpkg-dummy pkg $cross init || return $?
     fi
 
-    check_installed_pkg cross-vpkg-dummy-0.17_1 $cross
+    check_installed_pkg cross-vpkg-dummy-0.30_1 $cross
     [ $? -eq 0 ] && return 0
 
     msg_normal "Installing $cross cross pkg: cross-vpkg-dummy ...\n"

Re: [PR PATCH] [Updated] cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

There is an updated pull request by xtraeme against master on the void-packages repository

https://github.com/xtraeme/void-packages cross-vpkg-dummy-musl-vs-glibc
https://github.com/void-linux/void-packages/pull/12445

cross-vpkg-dummy: differentiate between musl and glibc.
A single pkg that provides musl and glibc and conflicts
with both, this is not a great idea.

Differentiate them to avoid issues like:

https://build.voidlinux.org/builders/armv6l-musl_builder/builds/19727/steps/shell_3/logs/stdio

Signed-off-by: Juan RP <xtraeme@gmail.com>

A patch file from https://github.com/void-linux/void-packages/pull/12445.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cross-vpkg-dummy-musl-vs-glibc-12445.patch --]
[-- Type: application/text/x-diff, Size: 3836 bytes --]

From 27d9144350f4e35f66d274a19c27b15e8e03325c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 13 Jun 2019 19:01:43 +0200
Subject: [PATCH 1/2] cross-vpkg-dummy: differentiate between musl and glibc.

A single pkg that provides musl and glibc and conflicts
with both, this is not a great idea.

Differentiate them to avoid issues like:

https://build.voidlinux.org/builders/armv6l-musl_builder/builds/19727/steps/shell_3/logs/stdio

Signed-off-by: Juan RP <xtraeme@gmail.com>
---
 srcpkgs/cross-vpkg-dummy/template | 53 +++++++++++++------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

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

From 82e6c763a8a2d9c6574cf37d22caf22f1c4c8177 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 13 Jun 2019 19:29:23 +0200
Subject: [PATCH 2/2] xbps-src/cross.sh: require cross-vpkg-dummy>=0.30.

Signed-off-by: Juan RP <xtraeme@gmail.com>
---
 common/xbps-src/shutils/cross.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh
index 393dfb53010..83b7b66fa39 100644
--- a/common/xbps-src/shutils/cross.sh
+++ b/common/xbps-src/shutils/cross.sh
@@ -28,12 +28,12 @@ prepare_cross_sysroot() {
     [ -z "$cross" -o "$cross" = "" ] && return 0
 
     # Check for cross-vpkg-dummy available for the target arch, otherwise build it.
-    pkg_available cross-vpkg-dummy $cross
+    pkg_available 'cross-vpkg-dummy>=0.30_1' $cross
     if [ $? -eq 0 ]; then
         $XBPS_LIBEXECDIR/build.sh cross-vpkg-dummy cross-vpkg-dummy pkg $cross init || return $?
     fi
 
-    check_installed_pkg cross-vpkg-dummy-0.17_1 $cross
+    check_installed_pkg cross-vpkg-dummy-0.30_1 $cross
     [ $? -eq 0 ] && return 0
 
     msg_normal "Installing $cross cross pkg: cross-vpkg-dummy ...\n"

Re: cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12445#issuecomment-501802992
Comment:
Should be fine now that cross.sh explicitely requires `cross-vpkg-dummy>=0.30`.

Re: cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/12445#issuecomment-501803937
Comment:
@pullmoll yeah, should be ok.

Re: [PR PATCH] [Merged]: cross-vpkg-dummy: differentiate between musl and glibc.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 469 bytes --]

There's a merged pull request on the void-packages repository

cross-vpkg-dummy: differentiate between musl and glibc.
https://github.com/void-linux/void-packages/pull/12445
Description: A single pkg that provides musl and glibc and conflicts
with both, this is not a great idea.

Differentiate them to avoid issues like:

https://build.voidlinux.org/builders/armv6l-musl_builder/builds/19727/steps/shell_3/logs/stdio

Signed-off-by: Juan RP <xtraeme@gmail.com>