From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] cross-vpkg-dummy: differentiate between musl and glibc.
Date: Thu, 13 Jun 2019 19:02:27 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12445@inbox.vuxu.org> (raw)
[-- 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
next reply other threads:[~2019-06-13 17:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 17:02 voidlinux-github [this message]
2019-06-13 17:09 ` voidlinux-github
2019-06-13 17:15 ` voidlinux-github
2019-06-13 17:17 ` voidlinux-github
2019-06-13 17:20 ` voidlinux-github
2019-06-13 17:24 ` voidlinux-github
2019-06-13 17:29 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-13 17:29 ` voidlinux-github
2019-06-13 17:30 ` voidlinux-github
2019-06-13 17:32 ` voidlinux-github
2019-06-13 17:35 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12445@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).