Control: tags 969697 +patch

On 2020-09-13, Bruce Korb wrote:
> I am ripping out Guile version checks. That means that if they change
> their interfaces again, AutoGen will stop working in inexplicable ways
> and it will take hours of work to determine the cause. But that risk
> seems small now, so updating the acceptable Guile version looks like
> more trouble than a mutation of the interface.
>
> I am trying to upload to alpha.gnu.org a new version 5.19.90 -- a 
> pre-release for 5.20. It looks like I successfully got some source RPMs 
> up there, but the distribution tarballs aren't seeming to make it. I'll 
> keep trying.

It seems like there is still a version check in config/guile.m4 in
5.19.96 from from debian experimental.

With the attached patches, it builds and passes the test suites using
guile 3.0.

live well,
  vagrant
From 32956b18f09cdc436f96e006a5486ba23d989c9e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <[email protected]>
Date: Wed, 16 Mar 2022 22:36:18 +0000
Subject: [PATCH 1/2] config/guile.m4: Allow guile 3.0.

---
 config/guile.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/guile.m4 b/config/guile.m4
index 89823e9..1338fbc 100644
--- a/config/guile.m4
+++ b/config/guile.m4
@@ -61,7 +61,7 @@
 #
 AC_DEFUN([GUILE_PKG],
  [PKG_PROG_PKG_CONFIG
-  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
+  _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
   if test -n "$GUILE_EFFECTIVE_VERSION"; then
     _guile_tmp=""
     for v in $_guile_versions_to_search; do
-- 
2.30.2

From a21423407b216bfd9873572072700d02b73fe5ca Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <[email protected]>
Date: Wed, 16 Mar 2022 22:36:44 +0000
Subject: [PATCH 2/2] debian/control, debian/rules: Switch to guile 3.0.

---
 debian/control | 2 +-
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 92d5f82..c28789c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Andreas Metzler <[email protected]>
 Build-Depends: chrpath,
  debhelper-compat (= 13),
  gperf,
- guile-2.2-dev,
+ guile-3.0-dev,
  libxml2-dev,
  pkg-config,
  tar (>= 1.28),
diff --git a/debian/rules b/debian/rules
index 8f298af..fb8e331 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_configure:
 		--with-libxml2-libs="$(shell $(DEB_HOST_GNU_TYPE)-pkg-config --libs libxml-2.0)" \
 		--with-libxml2-cflags="$(shell $(DEB_HOST_GNU_TYPE)-pkg-config --cflags libxml-2.0)" \
 		GREP=/bin/grep POSIX_SHELL=/bin/sh SHELL=/bin/sh \
-		CONFIG_SHELL=/bin/bash
+		CONFIG_SHELL=/bin/bash GUILE=/usr/bin/guile-3.0
 
 override_dh_auto_build:
 	dh_auto_build --verbose
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature

Reply via email to