From: unspecd <unspecd@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: Guile 3.0, again
Date: Wed, 23 Dec 2020 00:18:02 +0100 [thread overview]
Message-ID: <20201222231802.reOQUoTvvffmunIAzfJobmDIGhghWbscaZyF3qiW5uA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27320@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2411 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/27320#issuecomment-749830816
Comment:
How can I merge this with 720f2c1c52da5b672944381616cc76b23c9ed9fa?
`srcpkgs/guile/template`
```diff
@@ -1,20 +1,28 @@
# Template file for 'guile'
pkgname=guile
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--disable-static --disable-error-on-warning"
+configure_args="--disable-static --disable-error-on-warning --program-suffix=2"
hostmakedepends="pkg-config texinfo"
makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
+short_desc="Portable, embeddable Scheme implementation written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
subpackages="libguile guile-devel"
+alternatives="
+ guile:guile:/usr/bin/guile2
+ guile:guild:/usr/bin/guild2
+ guile:guile-config:/usr/bin/guile-config2
+ guile:guile-snarf:/usr/bin/guile-snarf2
+ guile:guile-tools:/usr/bin/guile-tools2
+ guile:guile.1:/usr/share/man/man1/guile2.1"
+
if [ "$CROSS_BUILD" ]; then
# Need host guile to cross compile
hostmakedepends+=" guile"
@@ -25,6 +33,14 @@ pre_configure() {
case "$XBPS_TARGET_MACHINE" in
ppc*) export CFLAGS+=" -Os";;
esac
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ rm test-suite/tests/{encoding-escapes,encoding-iso88597,i18n,iconv,r6rs-ports,reader,suspendable-ports,time}.test
+ fi
+}
+
+post_install() {
+ # conflicts with guile-1.8, guile-3.0
+ rm -rf ${DESTDIR}/usr/share/info
}
libguile_package() {
@@ -40,10 +56,11 @@ guile-devel_package() {
short_desc+=" - development files"
depends="gmp-devel gc-devel guile>=${version}_${revision}"
pkg_install() {
- vmove usr/bin/guile-config
+ vmove usr/bin/guile-config2
vmove usr/include
- vmove usr/share/aclocal
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/aclocal
+ mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-2.2.m4}
}
}
```
next prev parent reply other threads:[~2020-12-22 23:18 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 10:09 [PR PATCH] " unspecd
2020-12-21 10:11 ` [PR PATCH] [Updated] " unspecd
2020-12-21 10:19 ` [PR REVIEW] " sirikid
2020-12-21 10:51 ` [PR PATCH] [Updated] " unspecd
2020-12-21 12:25 ` unspecd
2020-12-21 12:27 ` unspecd
2020-12-21 12:38 ` unspecd
2020-12-21 12:45 ` unspecd
2020-12-21 12:47 ` [PR PATCH] [Updated] " unspecd
2020-12-21 12:48 ` unspecd
2020-12-21 13:08 ` unspecd
2020-12-21 13:29 ` q66
2020-12-21 13:30 ` q66
2020-12-21 13:31 ` q66
2020-12-21 14:33 ` [PR REVIEW] " ericonr
2020-12-21 14:33 ` ericonr
2020-12-21 14:33 ` ericonr
2020-12-21 14:33 ` ericonr
2020-12-22 3:14 ` [PR PATCH] [Updated] " unspecd
2020-12-22 3:21 ` [PR REVIEW] " unspecd
2020-12-22 3:38 ` [PR PATCH] [Updated] " unspecd
2020-12-22 5:14 ` unspecd
2020-12-22 6:04 ` unspecd
2020-12-22 8:13 ` [PR PATCH] [Updated] " unspecd
2020-12-22 9:28 ` unspecd
2020-12-22 9:38 ` [PR REVIEW] " unspecd
2020-12-22 9:38 ` sirikid
2020-12-22 9:43 ` [PR REVIEW] " sirikid
2020-12-22 9:45 ` unspecd
2020-12-22 9:48 ` [PR REVIEW] " sirikid
2020-12-22 9:50 ` sirikid
2020-12-22 9:54 ` sirikid
2020-12-22 9:55 ` fosslinux
2020-12-22 9:57 ` fosslinux
2020-12-22 10:13 ` [PR REVIEW] " unspecd
2020-12-22 10:21 ` unspecd
2020-12-22 10:33 ` [PR REVIEW] " unspecd
2020-12-22 10:48 ` [PR PATCH] [Updated] " unspecd
2020-12-22 10:48 ` q66
2020-12-22 10:50 ` unspecd
2020-12-22 10:57 ` q66
2020-12-22 11:00 ` q66
2020-12-22 12:04 ` [PR PATCH] [Updated] " unspecd
2020-12-22 12:56 ` unspecd
2020-12-22 13:12 ` unspecd
2020-12-22 14:35 ` unspecd
2020-12-22 14:36 ` unspecd
2020-12-22 18:25 ` [PR REVIEW] " unspecd
2020-12-22 20:52 ` sirikid
2020-12-22 21:43 ` [PR PATCH] [Updated] " unspecd
2020-12-22 21:47 ` unspecd
2020-12-22 21:49 ` unspecd
2020-12-22 21:52 ` unspecd
2020-12-22 21:54 ` unspecd
2020-12-22 22:05 ` unspecd
2020-12-22 23:02 ` [PR PATCH] [Updated] " unspecd
2020-12-22 23:18 ` unspecd [this message]
2020-12-24 7:22 ` unspecd
2020-12-24 10:03 ` unspecd
2020-12-24 10:04 ` unspecd
2020-12-24 10:05 ` unspecd
2020-12-26 0:51 ` [PR PATCH] [Updated] " unspecd
2020-12-26 0:54 ` unspecd
2020-12-26 4:55 ` [PR PATCH] [Updated] " unspecd
2020-12-26 6:14 ` unspecd
2020-12-26 6:26 ` [PR REVIEW] " ericonr
2020-12-26 6:26 ` ericonr
2020-12-26 6:26 ` ericonr
2020-12-26 6:51 ` unspecd
2020-12-26 7:58 ` unspecd
2020-12-26 8:08 ` unspecd
2020-12-26 8:53 ` unspecd
2021-01-08 6:20 ` [PR PATCH] [Updated] " unspecd
2021-01-08 6:20 ` unspecd
2021-01-08 6:22 ` unspecd
2021-01-08 6:23 ` unspecd
2021-01-13 5:50 ` [PR PATCH] [Updated] " unspecd
2021-01-29 9:03 ` unspecd
2021-02-04 13:49 ` unspecd
2021-03-01 15:10 ` unspecd
2021-03-08 0:02 ` unspecd
2021-03-08 3:08 ` unspecd
2021-03-08 3:08 ` ericonr
2021-03-11 8:39 ` unspecd
2021-03-11 8:49 ` [PR REVIEW] " unspecd
2021-03-11 9:20 ` travankor
2021-03-11 9:21 ` travankor
2021-03-14 19:44 ` sirikid
2021-03-15 5:11 ` unspecd
2021-03-15 5:26 ` sirikid
2021-03-15 9:01 ` unspecd
2021-03-15 9:02 ` [PR PATCH] [Updated] " unspecd
2021-03-15 9:03 ` unspecd
2021-03-15 9:05 ` unspecd
2021-03-15 9:37 ` [PR PATCH] [Updated] " unspecd
2021-03-15 15:19 ` unspecd
2021-03-15 15:20 ` unspecd
2021-03-15 15:32 ` [PR REVIEW] " unspecd
2021-03-15 15:41 ` unspecd
2021-03-28 0:31 ` [PR PATCH] [Updated] " unspecd
2021-05-10 13:06 ` unspecd
2021-05-10 23:56 ` unspecd
2022-01-06 2:00 ` [PR PATCH] [Updated] " unspecd
2022-01-06 2:01 ` unspecd
2022-01-06 2:02 ` [PR PATCH] [Updated] " unspecd
2022-01-06 2:29 ` unspecd
2022-03-04 6:03 ` unspecd
2022-06-03 2:10 ` github-actions
2022-06-17 2:13 ` [PR PATCH] [Closed]: " github-actions
2022-10-29 17:12 ` leahneukirchen
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=20201222231802.reOQUoTvvffmunIAzfJobmDIGhghWbscaZyF3qiW5uA@z \
--to=unspecd@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).