From unknown Tue Jun 17 01:32:35 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#55813] autogen: Use guile-3.0 Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jun 2022 00:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 55813@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165447641831565 (code B ref -1); Mon, 06 Jun 2022 00:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2022 00:46:58 +0000 Received: from localhost ([127.0.0.1]:33789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ny0tV-0008D2-Rq for submit@debbugs.gnu.org; Sun, 05 Jun 2022 20:46:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:53362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ny0tU-0008Cv-3F for submit@debbugs.gnu.org; Sun, 05 Jun 2022 20:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny0tT-0005JD-ST for guix-patches@gnu.org; Sun, 05 Jun 2022 20:46:55 -0400 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]:55888) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ny0tR-0000df-U1 for guix-patches@gnu.org; Sun, 05 Jun 2022 20:46:55 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id EFB731AAD2 for ; Sun, 5 Jun 2022 17:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1654476412; bh=RHfRV80aRqLkoNtzQuBAegMsOO780kWwQ3T2sGAU8XI=; h=From:To:Subject:Date:From; b=Kbz3+jOeY0nPxpKfhY0jAL92CXTMy2RK+gtYXVeFX0tGZH3tBX9e3tNDnyvSbTLiD HjbP8GlR+hlHgYCIUDtks4r6h2wve3QDkm1rjmNvIhXxatcbboja2zPdIp5YjDlA9m Alj+XGIzGvfdD5G73+39l+izbdyvhM5Oxv56vHvh+YFrerRY/ZJ5WegWR7mLZBm4WH vWFqAa5ggyX79JX/dw2chH16Gv5aJBJreulsTMugDOroRUL5fslqX5t5BSJZ9BrEun RRfiO5pFBa/j+XDdkFIMR7cNmXJ4koiLmf4hhp8IbuZSOopV/ZZiu0id26AOx2A8aq 2q3taBFMoxhmg== From: Vagrant Cascadian Date: Sun, 05 Jun 2022 17:46:46 -0700 Message-ID: <87ilpe4o09.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: none client-ip=2600:3c01:e000:267:0:a171:de7:c; envelope-from=vagrant@reproducible-builds.org; helo=cascadia.aikidev.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Some relatively simply patches make autogen build with guile-3.0. Used by both Debian an openSUSE, so already has a bit of field testing. I'm not 100% sure that it wasn't just dumb luck, but it seemed like building autogen with guile-3.0 was more likely to build reproducibly. It did require adding automake and autoconf to inputs, seeming to detect that something changed since configure was generated. Not sure if that could be avoided by being cleverer, or if that is an acceptible change. live well, vagrant --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0003-gnu-autogen-Build-with-guile-3.0.patch Content-Transfer-Encoding: quoted-printable From=209745d65234b70115a07d324f5514b125ad97369a 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 pha= se. [inputs]: Remove guile-2.2 and add automake, autoconf and guile-3.0. =2D-- 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 =2D-- 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)) =2D (inputs (list guile-2.2 perl)) ; for doc generator mdoc + (inputs (list automake autoconf guile-3.0 perl)) ; for doc ge= nerator mdoc (arguments '(#:configure-flags ;; XXX Needed to build 5.18.16. ./configure fails without it: @@ -62,6 +63,21 @@ (define-public autogen =20 #: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 < 30= 1000")) + (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 _ =2D-=20 2.35.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYp1OdwAKCRDcUY/If5cW qghzAPsFJ2ZAjbBp62GBGGmNCRya4kedbd422xxjjlQThT6plwD6AktrPwRA1uNR KeEwNwwunq5rE/2w2PDn4bZONm2aagI= =/5Fn -----END PGP SIGNATURE----- --==-=-=-- From unknown Tue Jun 17 01:32:35 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#55813] autogen: Use guile-3.0 Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Jun 2022 21:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Vagrant Cascadian Cc: 55813@debbugs.gnu.org Received: via spool by 55813-submit@debbugs.gnu.org id=B55813.16548956469812 (code B ref 55813); Fri, 10 Jun 2022 21:15:02 +0000 Received: (at 55813) by debbugs.gnu.org; 10 Jun 2022 21:14:06 +0000 Received: from localhost ([127.0.0.1]:51439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nzlxG-0002Y9-Dk for submit@debbugs.gnu.org; Fri, 10 Jun 2022 17:14:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nzlxF-0002XY-Cj for 55813@debbugs.gnu.org; Fri, 10 Jun 2022 17:14:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzlx9-0003jV-Rf; Fri, 10 Jun 2022 17:13:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=8zU3fRHi0uopLYC4eI0+VlAQNWIViqCeLr/kFELiWt4=; b=X3lMXZ6w+zG/g0fFBmHk 5aejkpOs6uANp4pEnJDNyQ18czTaBtMSp9Np910wU/QqsGVRfi3Sz7yhczj/aN5JBgntJgx2RjxSA 9FrycTYkMevV4/Qg1mzGSSNAEuWzvF+qSrsdUanWvGh6retYgwqj0irhnTI1467FLTv0N2qhbgTFq Ci4zLPf920oYgQ/pz8iQTtDKLtQb6Jih6YA7fyOkSsfyb32NX/IZAG97rYMB5ugjvQ0UfV1UyO99r G/qhlcRFrUS1wT7fEUcOz5wC3RY/IcMYwKzC3C4NyTo2u24VnMExQs9ztYlkBCWb16ZotXd5paVeM ZREYwuMZVRRgNQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=40914 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzlx9-0004eZ-G6; Fri, 10 Jun 2022 17:13:59 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87ilpe4o09.fsf@contorta> Date: Fri, 10 Jun 2022 23:13:57 +0200 In-Reply-To: <87ilpe4o09.fsf@contorta> (Vagrant Cascadian's message of "Sun, 05 Jun 2022 17:46:46 -0700") Message-ID: <871qvwz0fe.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Vagrant Cascadian skribis: > Some relatively simply patches make autogen build with guile-3.0. Used > by both Debian an openSUSE, so already has a bit of field testing. > > I'm not 100% sure that it wasn't just dumb luck, but it seemed like > building autogen with guile-3.0 was more likely to build reproducibly. Nice. :-) > It did require adding automake and autoconf to inputs, seeming to detect > that something changed since configure was generated. Not sure if that > could be avoided by being cleverer, or if that is an acceptible change. It could be avoided by changing just =E2=80=98configure=E2=80=99 (which thi= s patch already does actually), but it=E2=80=99s fine either way. > 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 p= hase. > [inputs]: Remove guile-2.2 and add automake, autoconf and guile-3.0. [...] > + (substitute* > + "agen5/guile-iface.h" You can move that string to the previous line. > + (substitute* > + (list > + "configure" > + "config/guile.m4") > + (("2.2 2.0 1.8") "3.0 2.2 2.0 1.8")))) Here you should either modify =E2=80=98config/guile.m4=E2=80=99, in which c= ase =E2=80=98autoreconf=E2=80=99 will have to run (that should be automatic), o= r modify =E2=80=98configure=E2=80=99, in which case the dependency on Autotools is u= nnecessary. The latter is a fine solution. OK with a change along these lines! Thanks, Ludo=E2=80=99. From unknown Tue Jun 17 01:32:35 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Vagrant Cascadian Subject: bug#55813: closed (Re: bug#55813: autogen: Use guile-3.0) Message-ID: References: <87ilp3dh90.fsf@contorta> <87ilpe4o09.fsf@contorta> X-Gnu-PR-Message: they-closed 55813 X-Gnu-PR-Package: guix-patches Reply-To: 55813@debbugs.gnu.org Date: Tue, 14 Jun 2022 04:04:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1655179442-1348-1" This is a multi-part message in MIME format... ------------=_1655179442-1348-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #55813: autogen: Use guile-3.0 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 55813@debbugs.gnu.org. --=20 55813: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D55813 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1655179442-1348-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 55813-done) by debbugs.gnu.org; 14 Jun 2022 04:03:05 +0000 Received: from localhost ([127.0.0.1]:60865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0xlg-0000KC-Gw for submit@debbugs.gnu.org; Tue, 14 Jun 2022 00:03:04 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:35452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0xle-0000Je-Be for 55813-done@debbugs.gnu.org; Tue, 14 Jun 2022 00:03:03 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 2D2401AB81; Mon, 13 Jun 2022 21:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1655179376; bh=tB7yR7D79Od+/LFm32b1zOeowV82LEj4va0hgFZUt18=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ldjIZ4rV15sGz8UGUuKwG/xy2Za6Q/6g6MG8w1WE/aQppkDXrwCx/ClTT873q6el+ DX5EhFeqMCWwy0IaH+ebFsxMKjWAKoHv8bquIa3TT8qi6/NPM0k/iBck8h1eoRMIjL V/cdFvRYlr9yQYXMeLon6A6echaxGmjDXCdRpJq6aFD6Dhb3H0/gJobnH9yn6RCsyZ Wjh8/OKu3gkOK08eFCag8X5pmkfKvcaDhdR1i0ecqitTxMayDkTGACjE2gs82JvAo/ CiNz1LrwSnKAyLqqt3l2TQEM1D6YRZQGL5v9DgPEOFDZzQcGscQr7eSPUkEUHep2SM 8R2e0P1/bFi7g== From: Vagrant Cascadian To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#55813: autogen: Use guile-3.0 In-Reply-To: <871qvwz0fe.fsf@gnu.org> References: <87ilpe4o09.fsf@contorta> <871qvwz0fe.fsf@gnu.org> Date: Mon, 13 Jun 2022 21:02:51 -0700 Message-ID: <87ilp3dh90.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 55813-done Cc: 55813-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2022-06-10, Ludovic Court=C3=A8s wrote: > Vagrant Cascadian skribis: > >> Some relatively simply patches make autogen build with guile-3.0. Used >> by both Debian an openSUSE, so already has a bit of field testing. >> >> I'm not 100% sure that it wasn't just dumb luck, but it seemed like >> building autogen with guile-3.0 was more likely to build reproducibly. > > Nice. :-) > >> It did require adding automake and autoconf to inputs, seeming to detect >> that something changed since configure was generated. Not sure if that >> could be avoided by being cleverer, or if that is an acceptible change. > > It could be avoided by changing just =E2=80=98configure=E2=80=99 (which t= his patch > already does actually), but it=E2=80=99s fine either way. Ah, that seems simpler, at least... >> 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. > > [...] > >> + (substitute* >> + "agen5/guile-iface.h" > > You can move that string to the previous line. Done. >> + (substitute* >> + (list >> + "configure" >> + "config/guile.m4") >> + (("2.2 2.0 1.8") "3.0 2.2 2.0 1.8")))) > > Here you should either modify =E2=80=98config/guile.m4=E2=80=99, in which= case > =E2=80=98autoreconf=E2=80=99 will have to run (that should be automatic),= or modify > =E2=80=98configure=E2=80=99, in which case the dependency on Autotools is= unnecessary. > > The latter is a fine solution. Ok, that seems like a smaller change, and still works, so went with that. > OK with a change along these lines! Thanks for the review! Pushed as 3691e37eb14c5871d213646154b98f5aaa5dd2f1. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYqgIbAAKCRDcUY/If5cW qmJSAP9ahJvS+EWoDx0IZ1Bf11rE8dLUAowYFP6twe62ZScESAD+OeyDtNPcd7Hu viZXP4iBHz8MX8DSQ7FYBcPFPR8Wjgw= =mlw2 -----END PGP SIGNATURE----- --=-=-=-- ------------=_1655179442-1348-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 6 Jun 2022 00:46:58 +0000 Received: from localhost ([127.0.0.1]:33789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ny0tV-0008D2-Rq for submit@debbugs.gnu.org; Sun, 05 Jun 2022 20:46:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:53362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ny0tU-0008Cv-3F for submit@debbugs.gnu.org; Sun, 05 Jun 2022 20:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny0tT-0005JD-ST for guix-patches@gnu.org; Sun, 05 Jun 2022 20:46:55 -0400 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]:55888) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ny0tR-0000df-U1 for guix-patches@gnu.org; Sun, 05 Jun 2022 20:46:55 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id EFB731AAD2 for ; Sun, 5 Jun 2022 17:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1654476412; bh=RHfRV80aRqLkoNtzQuBAegMsOO780kWwQ3T2sGAU8XI=; h=From:To:Subject:Date:From; b=Kbz3+jOeY0nPxpKfhY0jAL92CXTMy2RK+gtYXVeFX0tGZH3tBX9e3tNDnyvSbTLiD HjbP8GlR+hlHgYCIUDtks4r6h2wve3QDkm1rjmNvIhXxatcbboja2zPdIp5YjDlA9m Alj+XGIzGvfdD5G73+39l+izbdyvhM5Oxv56vHvh+YFrerRY/ZJ5WegWR7mLZBm4WH vWFqAa5ggyX79JX/dw2chH16Gv5aJBJreulsTMugDOroRUL5fslqX5t5BSJZ9BrEun RRfiO5pFBa/j+XDdkFIMR7cNmXJ4koiLmf4hhp8IbuZSOopV/ZZiu0id26AOx2A8aq 2q3taBFMoxhmg== From: Vagrant Cascadian To: guix-patches@gnu.org Subject: autogen: Use guile-3.0 Date: Sun, 05 Jun 2022 17:46:46 -0700 Message-ID: <87ilpe4o09.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: none client-ip=2600:3c01:e000:267:0:a171:de7:c; envelope-from=vagrant@reproducible-builds.org; helo=cascadia.aikidev.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Some relatively simply patches make autogen build with guile-3.0. Used by both Debian an openSUSE, so already has a bit of field testing. I'm not 100% sure that it wasn't just dumb luck, but it seemed like building autogen with guile-3.0 was more likely to build reproducibly. It did require adding automake and autoconf to inputs, seeming to detect that something changed since configure was generated. Not sure if that could be avoided by being cleverer, or if that is an acceptible change. live well, vagrant --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0003-gnu-autogen-Build-with-guile-3.0.patch Content-Transfer-Encoding: quoted-printable From=209745d65234b70115a07d324f5514b125ad97369a 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 pha= se. [inputs]: Remove guile-2.2 and add automake, autoconf and guile-3.0. =2D-- 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 =2D-- 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)) =2D (inputs (list guile-2.2 perl)) ; for doc generator mdoc + (inputs (list automake autoconf guile-3.0 perl)) ; for doc ge= nerator mdoc (arguments '(#:configure-flags ;; XXX Needed to build 5.18.16. ./configure fails without it: @@ -62,6 +63,21 @@ (define-public autogen =20 #: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 < 30= 1000")) + (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 _ =2D-=20 2.35.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYp1OdwAKCRDcUY/If5cW qghzAPsFJ2ZAjbBp62GBGGmNCRya4kedbd422xxjjlQThT6plwD6AktrPwRA1uNR KeEwNwwunq5rE/2w2PDn4bZONm2aagI= =/5Fn -----END PGP SIGNATURE----- --==-=-=-- ------------=_1655179442-1348-1--