From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id uDNXIXs3PGe8+AAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 07:00:11 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id uDNXIXs3PGe8+AAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:00:11 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=nYYUVRaj;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=UEB57vre;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1731999611;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=dNHTgQn2iv/vmWV5oFdb5KfwYTvADA/xgJ7u01dY2v4=;
	b=Hr04q8geSe9wZlBmHkHbedf3oLJrDhUnnB+wMyMcdi2ZH6U8rxeZnbOtxVidCNjzNvWfyd
	r4ozQcuOxa8wxqsxdH4mIIbILwEc45i9bmNNe59LYS2hHfT1bB4TIqn0xCXTgQxfNWP1k7
	+vAgOTiG4O9+rCwBQVaD2E7pc4w71AWrxv80LRE5OzI/YKU7kN1aPXedEsO0EZlnbi3O3e
	1Zcyi68fZn5vM6+r5gO03uXQmWwbXduVx3GnswSFzw//f+OY8p+VCK9gUwPd43z4+2UUPZ
	N+mp4xHfekbCZJKVoEkn5KQWMZwj6hZDD5tQtwGOo77oyU2JfnR+bewOCoAOhg==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=nYYUVRaj;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=UEB57vre;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731999611; a=rsa-sha256; cv=none;
	b=enMj65nrxxmaWgaNclo0zpa1mM5CUpc0aZrBvlaUp9OPX68lq4bWOC9N8mzrUfMA8kLMoC
	o5mxKiDBy727Yae19uJnz2/F3apgCErd2Ssskxg/zZ5Fcbv08eeDSqqG6Jc3nZyCQLBiIK
	b8HFD2I+wBfcfZFtK8YuQzVJfFQxfkaEgl81YSlTVvsXUHKPvQE9S/eRvYDRXwFXySDlg7
	vZcW4Z59kei4RvStznR/191GyK5DXAeVJiYV1/9tXjtcF5z60j98RNqZuaIP9gWKjM61/T
	wGfBXIAQ9+VhwU0ZoHWAUdbHvTSvxUSoY/40xKUzMsjcKHMIAuf1dxbYbad1mg==
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 1F588435E0
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:00:11 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tDICm-0008Qk-Cq; Tue, 19 Nov 2024 01:59:20 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tDICj-0008Nt-Ef
 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:17 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tDICj-0004Kc-5x
 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:17 -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=dNHTgQn2iv/vmWV5oFdb5KfwYTvADA/xgJ7u01dY2v4=; 
 b=nYYUVRajG2GaU6rs7gRSVjUWILUCrjPuLboaw0/lm5bKu8tUc+qHV8r6ToIItdh/BMKKtByR+O+RMcDi+zlf1KOPCZJAwRfgWQJJybIuXoSfrCrEVLe3LRhVgKliJp8g1jQ5ot6JcxHbCSrkk+H1+NUMKXS5NJum+HGkyEjTvBIhag4yEhy0UQYcBQXMFgH0PKq4jJk9dpAK2pIZZNsi65WVQnvAeXZkt+t8jDUIC3f6yKquF5lN+VlU5i1X01FmW6iTTAWJ1fnJWXs9CFxx/lVd9zyPcSLtlS4RcaGoY3YZ9SpGiJzaWmauza73FMgzQuEy3YQrh9qCvMXSgNvZeg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tDICj-0005IL-28
 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:17 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v3 18/51] gnu: texinfo-4: Fix [cross-]build with
 gcc-14 and the 64bit Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Tue, 19 Nov 2024 06:59:17 +0000
Resent-Message-ID: <handler.74290.B74290.173199951119859@debbugs.gnu.org>
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.173199951119859
 (code B ref 74290); Tue, 19 Nov 2024 06:59:17 +0000
Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:31 +0000
Received: from localhost ([127.0.0.1]:40494 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tDIBy-00059w-8j
 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:31 -0500
Received: from eggs.gnu.org ([209.51.188.92]:48542)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tDIBr-00057C-G7
 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:24 -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 <janneke@gnu.org>)
 id 1tDI9f-0003zB-NI; Tue, 19 Nov 2024 01:56:07 -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=dNHTgQn2iv/vmWV5oFdb5KfwYTvADA/xgJ7u01dY2v4=; b=UEB57vreQFgjFGFdX+wC
 /xbEBald9BV3C5m0F1Ma9X7Ake5LgLs5STMiZVtEx5emoBvEk0eh7E06+EaNemiL/tekBlFBcAI0a
 A3htX0Rrf930LI5zKCWaw0Rhm58f67BHffZWrAAzeJ/xZ3XRHMzxhZBj6/Er0SS3wuls1khZ3DezW
 FQj1Kr2a7sKtG6PrWbtmX3f3xuD+nLR6VV/NhmrVkHBuOOWnn9SngPokyo8+FEI1eyJwStfmntjzE
 IYIAjfOxesU1ix1BHHeVg6/1Ke45TLyzBPEKuY+YZj7YokFqFaGpHJcbEYcqDrK8aSccaA4XKn+PO
 j3D34Fk69PHnhw==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 19 Nov 2024 07:54:48 +0100
Message-ID: <f89984f54482cb3e05ef3c165d731050c718d94f.1731999203.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731999202.git.janneke@gnu.org>
References: <cover.1731999202.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Country: US
X-Migadu-Flow: FLOW_IN
X-Migadu-Scanner: mx11.migadu.com
X-Migadu-Spam-Score: -3.72
X-Spam-Score: -3.72
X-Migadu-Queue-Id: 1F588435E0
X-TUID: VxXoHVdYgkNU

* gnu/packages/texinfo.scm (texinfo-4): When building for the 64bit Hurd, or
cross-compiling, 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..c30ca3c788 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
 ;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;;
@@ -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 (or (target-hurd64?) (%current-target-system))
+          (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
-- 
2.46.0