[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: autogen: Build with guile 3.0.
From: |
guix-commits |
Subject: |
01/02: gnu: autogen: Build with guile 3.0. |
Date: |
Mon, 13 Jun 2022 23:59:50 -0400 (EDT) |
vagrantc pushed a commit to branch master
in repository guix.
commit 3691e37eb14c5871d213646154b98f5aaa5dd2f1
Author: Vagrant Cascadian <vagrant@reproducible-builds.org>
AuthorDate: Sun Jun 5 16:05:02 2022 -0700
gnu: autogen: Build with guile 3.0.
* gnu/packages/autogen.scm (autogen)[arguments]: Add 'support-guile-3.0
phase.
[inputs]: Remove guile-2.2 and add guile-3.0.
---
gnu/packages/autogen.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/autogen.scm b/gnu/packages/autogen.scm
index d0c8df17ec..d0e4f2f34c 100644
--- a/gnu/packages/autogen.scm
+++ b/gnu/packages/autogen.scm
@@ -49,7 +49,7 @@
"def_bf[MAXNAMELEN + 10]")))))
(build-system gnu-build-system)
(native-inputs (list pkg-config which))
- (inputs (list guile-2.2 perl)) ; for doc generator mdoc
+ (inputs (list guile-3.0 perl)) ; for doc generator mdoc
(arguments
'(#:configure-flags
;; XXX Needed to build 5.18.16. ./configure fails without it:
@@ -62,6 +62,17 @@
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'support-guile-3.0
+ ;; Upstream bug:
+ ;; https://sourceforge.net/p/autogen/bugs/196/
+ ;;
+ ;; Supported in Debian and openSUSE:
+ ;;
https://salsa.debian.org/debian/autogen/-/blob/master/debian/patches/40_suse_04-guile-version.patch
+ (lambda _
+ (substitute* "agen5/guile-iface.h"
+ (("#elif GUILE_VERSION < 203000") "#elif GUILE_VERSION <
301000"))
+ (substitute* "configure"
+ (("2.2 2.0 1.8") "3.0 2.2 2.0 1.8"))))
(add-before 'build 'set-man-page-date
;; Avoid embedding the current date for reproducible builds
(lambda _