From 9745d65234b70115a07d324f5514b125ad97369a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 5 Jun 2022 16:05:02 -0700 Subject: [PATCH 3/3] 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 automake, autoconf and guile-3.0. --- gnu/packages/autogen.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/autogen.scm b/gnu/packages/autogen.scm index d0c8df17ec..7e22167be5 100644 --- a/gnu/packages/autogen.scm +++ b/gnu/packages/autogen.scm @@ -25,6 +25,7 @@ (define-module (gnu packages autogen) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages base) @@ -49,7 +50,7 @@ (define-public autogen "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 automake autoconf guile-3.0 perl)) ; for doc generator mdoc (arguments '(#:configure-flags ;; XXX Needed to build 5.18.16. ./configure fails without it: @@ -62,6 +63,21 @@ (define-public autogen #: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* + (list + "configure" + "config/guile.m4") + (("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 _ -- 2.35.1