From patchwork Mon Jun 6 00:46:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 39753 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2BBA727BBEA; Mon, 6 Jun 2022 01:47:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AA6E627BBE9 for ; Mon, 6 Jun 2022 01:47:09 +0100 (BST) Received: from localhost ([::1]:45888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ny0tg-0005Kd-R2 for patchwork@mira.cbaines.net; Sun, 05 Jun 2022 20:47:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny0ta-0005KU-As for guix-patches@gnu.org; Sun, 05 Jun 2022 20:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39892) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ny0ta-0000en-23 for guix-patches@gnu.org; Sun, 05 Jun 2022 20:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ny0ta-0008DM-0P for guix-patches@gnu.org; Sun, 05 Jun 2022 20:47:02 -0400 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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