From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Remove XBPS arch file from musl, have it in xbps for all archs instead
Date: Fri, 01 Jan 2021 07:45:56 +0100 [thread overview]
Message-ID: <20210101064556.cm3_yjwr4hi78MKuRugvvS-iKSP87thY3dYt-iazog0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27582@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages xbps-musl
https://github.com/void-linux/void-packages/pull/27582
Remove XBPS arch file from musl, have it in xbps for all archs instead
A patch file from https://github.com/void-linux/void-packages/pull/27582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-musl-27582.patch --]
[-- Type: text/x-diff, Size: 4127 bytes --]
From a849db071671375e910642f4e950bbbb37cc6f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 15:30:06 -0300
Subject: [PATCH 1/2] musl: remove repository config file and clean up.
- musl doesn't need kernel-libc-headers in order to be built
- no need to conflict with glibc, since it can't be built for *-musl
targets
- the repository config file will be created in xbps instead, but it
isn't even truly needed, since XBPS "knows" when it was built for musl
---
srcpkgs/musl/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a6a49ff3d05..5ba5425709b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,19 +2,17 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=5
+revision=6
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
configure_args="--prefix=/usr --disable-gcc-wrapper"
-makedepends="kernel-libc-headers"
short_desc="Musl C library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
-conflicts="glibc>=0"
nostrip_files="libc.so"
shlib_provides="libc.so"
@@ -27,7 +25,7 @@ post_build() {
do_install() {
# Move everything to /usr.
vmkdir usr/lib
- ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/lib
+ ln -s usr/lib ${DESTDIR}/lib
make DESTDIR=${DESTDIR} install
rm ${DESTDIR}/lib
# provide ldd
@@ -41,9 +39,7 @@ do_install() {
vman ${FILESDIR}/getconf.1
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
- # Create xbps.d(5) arch override file
- vmkdir usr/share/xbps.d
- echo "architecture=${XBPS_TARGET_MACHINE}" > ${DESTDIR}/usr/share/xbps.d/musl-arch.conf
+
vlicense COPYRIGHT
}
@@ -52,7 +48,7 @@ musl-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
- vmove usr/lib/*.o
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.o"
}
}
From 42aae5c721b5db8008aee9165f6488267f8971a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 15:33:52 -0300
Subject: [PATCH 2/2] xbps: add architecture file for all archs.
This adds the musl-arch.conf file that was previously contained in the
musl package. No need to special case musl, so add it for all archs.
---
srcpkgs/xbps/template | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 66deab88d1b..039ecea6310 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=2
+revision=3
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
@@ -33,21 +33,27 @@ fi
do_configure() {
./configure --prefix=/usr --sysconfdir=/etc ${CHROOT_READY:+--enable-tests}
}
+
post_install() {
+ local _repo="repository=https://alpha.de.repo.voidlinux.org"
case "$XBPS_TARGET_MACHINE" in
aarch64*) # XXX different repo location
- echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64" > \
+ echo "${_repo}/current/aarch64" > \
${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
;;
*-musl) # XXX different repo location
- echo "repository=https://alpha.de.repo.voidlinux.org/current/musl" > \
+ echo "${_repo}/current/musl" > \
${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
;;
*)
- echo "repository=https://alpha.de.repo.voidlinux.org/current" > \
+ echo "${_repo}/current" > \
${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
;;
esac
+
+ echo "architecture=${XBPS_TARGET_MACHINE}" > \
+ ${DESTDIR}/usr/share/xbps.d/xbps-arch.conf
+
vlicense LICENSE
vlicense LICENSE.3RDPARTY
}
@@ -58,6 +64,7 @@ libxbps_package() {
vmove "usr/lib/*.so.*"
}
}
+
libxbps-devel_package() {
short_desc+=" - runtime library (development files)"
depends="${makedepends} libxbps>=${version}_${revision}"
next prev parent reply other threads:[~2021-01-01 6:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-31 18:36 [PR PATCH] " ericonr
2020-12-31 19:52 ` ericonr
2020-12-31 19:52 ` ericonr
2021-01-01 6:45 ` ericonr [this message]
2021-01-02 18:31 ` [PR REVIEW] " abenson
2021-01-02 19:10 ` ericonr
2021-01-20 12:36 ` sgn
2021-01-20 12:47 ` q66
2021-01-20 13:26 ` sgn
2021-01-20 15:25 ` q66
2021-01-28 0:17 ` [PR PATCH] [Updated] " ericonr
2021-01-28 3:59 ` [PR PATCH] [Merged]: " ericonr
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=20210101064556.cm3_yjwr4hi78MKuRugvvS-iKSP87thY3dYt-iazog0@z \
--to=ericonr@users.noreply.github.com \
--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).