* [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead
@ 2020-12-31 18:36 ericonr
2020-12-31 19:52 ` ericonr
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: ericonr @ 2020-12-31 18:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
There is a new 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: 4301 bytes --]
From f8935bcc60a798e6c7aa16dfbc2e3812fdc4785d 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 | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a6a49ff3d05..165936da55c 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,23 +25,24 @@ 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
vmkdir usr/bin
ln -s ../lib${XBPS_TARGET_WORDSIZE}/libc.so ${DESTDIR}/usr/bin/ldd
+
# additional utils from Alpine/NetBSD
vbin iconv
vbin getent
vman ${FILESDIR}/getent.1
vbin getconf
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 +51,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 b140101988da7af8080437e75183b5a303c0a711 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}"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
@ 2020-12-31 19:52 ` ericonr
2020-12-31 19:52 ` ericonr
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-12-31 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27582#issuecomment-753055306
Comment:
@Duncaen
CI Failures are in the install test (fails because of `libgcc_s`) and in i686 because of an `uname` mismatch
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
2020-12-31 19:52 ` ericonr
@ 2020-12-31 19:52 ` ericonr
2021-01-01 6:45 ` [PR PATCH] [Updated] " ericonr
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-12-31 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27582#issuecomment-753055306
Comment:
@Duncaen
CI Failures are in the install test (fails because of `libgcc_s`) and in i686 because of a `uname` mismatch
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
2020-12-31 19:52 ` ericonr
2020-12-31 19:52 ` ericonr
@ 2021-01-01 6:45 ` ericonr
2021-01-02 18:31 ` [PR REVIEW] " abenson
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-01-01 6:45 UTC (permalink / raw)
To: ml
[-- 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}"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
` (2 preceding siblings ...)
2021-01-01 6:45 ` [PR PATCH] [Updated] " ericonr
@ 2021-01-02 18:31 ` abenson
2021-01-02 19:10 ` ericonr
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: abenson @ 2021-01-02 18:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/27582#discussion_r550907911
Comment:
Why this?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
` (3 preceding siblings ...)
2021-01-02 18:31 ` [PR REVIEW] " abenson
@ 2021-01-02 19:10 ` ericonr
2021-01-20 12:36 ` sgn
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-01-02 19:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27582#discussion_r550911275
Comment:
Because musl is only built for `*-musl` archs, and glibc is only built for `~*-musl` ones, so the conflict is totally unnecessary.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
` (4 preceding siblings ...)
2021-01-02 19:10 ` ericonr
@ 2021-01-20 12:36 ` sgn
2021-01-20 12:47 ` q66
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-01-20 12:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 462 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/27582#discussion_r560926885
Comment:
Bikeshedding, I actually prefer something like:
```sh
local _postfix=
case "$XBPS_TARGET_MACHINE" in
aarch64*) _postfix="/aarch64" ;;
*-musl) _postfix="/musl" ;;
esac
echo "repository=https://alpha.de.repo.voidlinux.org/current$_postfix" \
>${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
```
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
` (5 preceding siblings ...)
2021-01-20 12:36 ` sgn
@ 2021-01-20 12:47 ` q66
2021-01-20 13:26 ` sgn
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: q66 @ 2021-01-20 12:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27582#discussion_r560933429
Comment:
it's called suffix :P
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
` (6 preceding siblings ...)
2021-01-20 12:47 ` q66
@ 2021-01-20 13:26 ` sgn
2021-01-20 15:25 ` q66
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-01-20 13:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/27582#discussion_r560957270
Comment:
Hm, it seems like they're interchangeable https://english.stackexchange.com/questions/81263/postfix-or-suffix
But, whatever...
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
` (7 preceding siblings ...)
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
10 siblings, 0 replies; 12+ messages in thread
From: q66 @ 2021-01-20 15:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27582#discussion_r561050754
Comment:
people very rarely say postfix except in specific cases (like postfix operator in programming languages), when you're appending something, it's nearly always called a suffix
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
` (8 preceding siblings ...)
2021-01-20 15:25 ` q66
@ 2021-01-28 0:17 ` ericonr
2021-01-28 3:59 ` [PR PATCH] [Merged]: " ericonr
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-01-28 0:17 UTC (permalink / raw)
To: ml
[-- 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: 4190 bytes --]
From 3a2dc364ce298a5900fc11a0c56cb493e45dfef7 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 021c4222584e0a0588e37fc01dcbb79a352ad09c 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 an equivalent for 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 | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 66deab88d1b..e43050da90e 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,23 @@ fi
do_configure() {
./configure --prefix=/usr --sysconfdir=/etc ${CHROOT_READY:+--enable-tests}
}
+
post_install() {
+ local _repo="repository=https://alpha.de.repo.voidlinux.org" _suffix=
case "$XBPS_TARGET_MACHINE" in
aarch64*) # XXX different repo location
- echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64" > \
- ${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+ _suffix="/aarch64"
;;
*-musl) # XXX different repo location
- echo "repository=https://alpha.de.repo.voidlinux.org/current/musl" > \
- ${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
- ;;
- *)
- echo "repository=https://alpha.de.repo.voidlinux.org/current" > \
- ${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+ _suffix="/musl"
;;
esac
+
+ echo "${_repo}/current${_suffix}" > \
+ ${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+ echo "architecture=${XBPS_TARGET_MACHINE}" > \
+ ${DESTDIR}/usr/share/xbps.d/xbps-arch.conf
+
vlicense LICENSE
vlicense LICENSE.3RDPARTY
}
@@ -58,6 +60,7 @@ libxbps_package() {
vmove "usr/lib/*.so.*"
}
}
+
libxbps-devel_package() {
short_desc+=" - runtime library (development files)"
depends="${makedepends} libxbps>=${version}_${revision}"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Merged]: Remove XBPS arch file from musl, have it in xbps for all archs instead
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
` (9 preceding siblings ...)
2021-01-28 0:17 ` [PR PATCH] [Updated] " ericonr
@ 2021-01-28 3:59 ` ericonr
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-01-28 3:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
There's a merged pull request on the void-packages repository
Remove XBPS arch file from musl, have it in xbps for all archs instead
https://github.com/void-linux/void-packages/pull/27582
Description:
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-01-28 3:59 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-31 18:36 [PR PATCH] Remove XBPS arch file from musl, have it in xbps for all archs instead ericonr
2020-12-31 19:52 ` ericonr
2020-12-31 19:52 ` ericonr
2021-01-01 6:45 ` [PR PATCH] [Updated] " ericonr
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
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).