From: unspecd <unspecd@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Guile 3.0, again
Date: Mon, 21 Dec 2020 11:09:20 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27320@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
There is a new pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/guile3
https://github.com/void-linux/void-packages/pull/27320
Guile 3.0, again
A patch file from https://github.com/void-linux/void-packages/pull/27320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/guile3-27320.patch --]
[-- Type: text/x-diff, Size: 9587 bytes --]
From df4d0afc3d88a0b36c2a583c418d18abff9951d4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 14:14:36 +1100
Subject: [PATCH 1/4] New package: guile3-3.0.4
---
common/shlibs | 1 +
srcpkgs/guile3-devel | 1 +
srcpkgs/guile3/template | 46 +++++++++++++++++++++++++++++++++++++++++
srcpkgs/libguile3 | 1 +
4 files changed, 49 insertions(+)
create mode 120000 srcpkgs/guile3-devel
create mode 100644 srcpkgs/guile3/template
create mode 120000 srcpkgs/libguile3
diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..47ed174a615 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,4 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
libutil-cmdline-samba4.so samba-libs-4.13.2_1
libwbclient.so.0 samba-libs-4.13.2_1
libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3-3.0.4_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..3cd91e2f660
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,46 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.4
+revision=1
+wrksrc="guile-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3"
+hostmakedepends="pkg-config"
+makedepends="gc-devel gmp-devel readline-devel libffi-devel libltdl-devel libunistring-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+conflicts="guile" # /usr/share/info/{guile.info*,r5rs.info}
+
+if [ "$CROSS_BUILD" ]; then
+ # Need host guile to cross compile
+ hostmakedepends+=" guile3"
+ export GUILE_FOR_BUILD=guile3
+fi
+
+libguile3_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove usr/lib/guile/3.0
+ vmove "usr/lib/*.so.*"
+ vmkdir usr/share/gdb/auto-load/usr/lib
+ mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+ }
+}
+
+guile3-devel_package() {
+ short_desc+=" - development files"
+ depends="gmp-devel guile3>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/bin/guile-config3
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/aclocal
+ vmove usr/share/guile
+ }
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
From bd34dc4d39b8655f4a225716a47a1858a2527d7e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:27:16 +1100
Subject: [PATCH 2/4] gdb: enable guile
---
srcpkgs/gdb/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..d9bd205ac42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,18 +1,19 @@
# Template file for 'gdb'
pkgname=gdb
version=10.1
-revision=2
+revision=3
build_style=gnu-configure
pycompile_dirs="/usr/share/gdb/python"
-configure_args="--disable-werror --disable-nls --with-system-readline
+configure_args="--disable-werror --disable-nls --with-system-readline $(vopt_with guile)
--with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
$(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
$(vopt_if python --with-python=/usr/bin/python3)
$(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel) $(vopt_if guile guile3)"
makedepends="ncurses-devel zlib-devel readline-devel expat-devel
$(vopt_if python 'python3-devel gettext-libs')
- $(vopt_if debuginfod elfutils-devel)"
+ $(vopt_if debuginfod elfutils-devel)
+ $(vopt_if guile guile3-devel)"
short_desc="GNU Debugger"
maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-3.0-or-later"
@@ -21,6 +22,13 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
python_version=3
patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
if [ "${CROSS_BUILD}" ]; then
# Make python3.x detection work in cross builds
@@ -30,11 +38,11 @@ fi
CFLAGS+=" -fcommon"
CXXFLAGS+=" -fcommon"
# Package build options
-build_options="gdbserver static python debuginfod"
+build_options="gdbserver static python debuginfod guile"
desc_option_gdbserver="Enable support for building GDB server"
desc_option_debuginfod="Enable support for libdebuginfod"
# Enable gdbserver if !static.
-build_options_default="gdbserver python debuginfod"
+build_options_default="gdbserver python debuginfod guile"
# Both options cannot be enabled at the same time
vopt_conflict gdbserver static
From 3cd2ee71f21e802dca2801ee214862fa5a8ae56c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 17:28:19 +1100
Subject: [PATCH 3/4] gnutls: enable guile
---
srcpkgs/gnutls/patches/use-guile3.patch | 11 +++++++++++
srcpkgs/gnutls/template | 12 ++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/gnutls/patches/use-guile3.patch
diff --git a/srcpkgs/gnutls/patches/use-guile3.patch b/srcpkgs/gnutls/patches/use-guile3.patch
new file mode 100644
index 00000000000..ac7d10c3d8c
--- /dev/null
+++ b/srcpkgs/gnutls/patches/use-guile3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1052,7 +1052,7 @@
+ *** Detecting GNU Guile...
+ ])
+
+- AC_PATH_PROG([guile_snarf], [guile-snarf])
++ AC_PATH_PROG([guile_snarf], [guile-snarf3])
+ if test "x$guile_snarf" = "x"; then
+ AC_MSG_WARN([`guile-snarf' from Guile not found. Guile bindings not built.])
+ opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 681f6c7ca8c..eb95346e401 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,16 @@
# Template file for 'gnutls'
pkgname=gnutls
version=3.6.15
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_enable guile)
--disable-valgrind-tests --disable-rpath
--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
--with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which $(vopt_if guile guile3)"
makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
checkdepends="iproute2"
short_desc="GNU Transport Layer Security library"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +19,9 @@ homepage="https://gnutls.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
checksum=0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
+build_options="guile"
+build_options_default="guile"
+
pre_configure() {
autoreconf -vfi
}
@@ -39,6 +42,7 @@ gnutls-devel_package() {
vmove usr/share/info
}
}
+
gnutls-tools_package() {
short_desc+=" - bundled tools"
pkg_install() {
From 3b38b84359b81b1be1d6878ef71f75083d8a0db4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 21 Dec 2020 21:05:18 +1100
Subject: [PATCH 4/4] xbindkeys: rebuild for guile-3.0.4
---
srcpkgs/xbindkeys/template | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 54486843942..3236d5989fc 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -1,14 +1,23 @@
# Template file for 'xbindkeys'
pkgname=xbindkeys
version=1.8.7
-revision=2
+revision=3
build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libX11-devel guile-devel guile gc-devel"
-depends="guile"
+hostmakedepends="automake pkg-config"
+makedepends="libX11-devel guile3-devel gc-devel"
+depends="guile3"
short_desc="Launch shell commands with your keyboard or your mouse under X"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
+
+# XXX: work around autoreconf error: "possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS".
+makedepends+=" gettext-devel"
+
+pre_configure() {
+ # regenerate to grab guile-3.0 package
+ autoreconf -fi
+ # aclocal && autoconf && automake --foreign --add-missing
+}
next reply other threads:[~2020-12-21 10:09 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 10:09 unspecd [this message]
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
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27320@inbox.vuxu.org \
--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).