From patchwork Tue Nov 12 16:25:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70304 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 909E327BBE2; Tue, 12 Nov 2024 16:31:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C0AC827BBE9 for ; Tue, 12 Nov 2024 16:31:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtnV-0004rw-7l; Tue, 12 Nov 2024 11:31:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtnD-0004hw-PX for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtnD-00064i-Gg for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=5kbzB21ou56Kj2BT+NNRRVW2UKTUSjGtnepg1Ty+AfQ=; b=q8PCuxcP7iK5hmCeRMeFFwjQfPaDVyV1lb06cMFtYvNRdTJp4CA+UN99i2pB93bPBxBS2JXamwRum9+uimymOk+I13OTswi+weMGIz3UcNwo1/dbtG3UYx/uo7fHEPI6RWyVulzqfPNLOL7yfuhjCivvSvLDp5MfWxQRiSLNngz9k0M6Zdom2+Uu4+m8VK9s+fIkNVwq44s5ma4IDNqUjxRUAwMV3ktsQ3IODzChgomaFOqMYTYd2xsNgGgxBl8an5zN9KqEFKqRUOnpvQUXMxFI63VMR0GBwgKqWqY6mSfyYwT9iQCI8B2XGuQ5eSXeyhMPzoJ70dQ+v3DI9Q7uKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnD-0000dQ-B3 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 37/40] gnu: texinfo-4: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290272266 (code B ref 74290); Tue, 12 Nov 2024 16:31:03 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:27 +0000 Received: from localhost ([127.0.0.1]:39259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmc-0000aO-E4 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtm0-0000MZ-1X for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:48 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjo-0005Sk-6k; Tue, 12 Nov 2024 11:27:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=5kbzB21ou56Kj2BT+NNRRVW2UKTUSjGtnepg1Ty+AfQ=; b=Vf5UsrhOtnD/dTH4P/9s QnfVQ21TPTKTulu2RQvB7JAhNu0dcIcf6vbXjwlrfTlx57MhWRod75MyNo7G/9oP5lbLkekwtxWnM kMVsV5A93ZomEFU5bnebsWl3tBpjPP/BZ9WhRaiqRXvEP91Pl/0SChDUI2CEDXluKrXg1LCOp9mYW Y2dqpWwTCkXLOHclEV9uLtxO4I939v9qpjaAKEW5WCvUuwdIDw1qdQAfUTHpt70+rDxa0LDWpRCcb 5Sgpqsf7NgDan85B8j/pxPKgDyAJEpZBZchiTtwEWR+hzxOJJDLS2l7S3ixi34RcPK+8mhoB/L4Ss Vx1bHM1NEjVOvA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:46 +0100 Message-ID: <645534e6b891ad98d6d2971cb8dc14acb508aed1.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/texinfo.scm (texinfo-4): When building for the 64bit Hurd, add "-Wno-incompatible-pointer-types" to #:configure-flags. Change-Id: Ia0503e3f5c7aa5354a949b69035a1be6f93ec85f --- gnu/packages/texinfo.scm | 50 ++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 81afdaf7a7..c0a35b6ffa 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 ( ;;; @@ -165,31 +165,35 @@ (define-public texinfo-4 (modify-inputs (package-native-inputs texinfo) (prepend automake))) (arguments - (substitute-keyword-arguments (package-arguments texinfo) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'fix-configure - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Replace outdated config.sub and config.guess. - (with-directory-excursion "build-aux" - (for-each - (lambda (file) - (install-file (string-append - (assoc-ref - (or native-inputs inputs) "automake") - "/share/automake-" - ,(version-major+minor - (package-version automake)) - "/" file) ".")) - '("config.sub" "config.guess"))) - #t)) - ;; Build native version of tools before running 'build phase. - ,@(if (%current-target-system) - `((add-before 'build 'make-native-gnu-lib + (append + (substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess. + (with-directory-excursion "build-aux" + (for-each + (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ;; Build native version of tools before running 'build phase. + ,@(if (%current-target-system) + `((add-before 'build 'make-native-gnu-lib (lambda* (#:key inputs #:allow-other-keys) (invoke "make" "-C" "tools/gnulib/lib") #t))) - '()))))))) + '())))) + (if (target-hurd64?) + (list #:configure-flags ''("CFLAGS=-Wno-incompatible-pointer-types")) + '()))))) (define-public info-reader ;; The idea of this package is to have the standalone Info reader without