From patchwork Sun Nov 24 07:54:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 33797 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 994B227BBEA; Sun, 24 Nov 2024 07:58:07 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 1DE6D27BBE2 for ; Sun, 24 Nov 2024 07:58:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Uc-0000IQ-Sh; Sun, 24 Nov 2024 02:57:19 -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 1tF7UU-0000Ea-Ip for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -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 1tF7UU-0002LD-AP for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -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=4B7O21e4Ya9ExhiXsAGVMXRIEvNrT7qik/64Z91abLc=; b=Cjh+sJ1UlTwYc7vg02lWvvTnZqvSy4xOkXE3kHo8tycwWcegU2zdIrbf75N6MZ0pW4L1f2XV3UStFjKrOJ/dZUx0cfMFqIELviHSMNMVx3i/Bhl7+g11uD+JDFoeBk6YnKJLgylsmJ4MdWmK0XjPhKUiZ5uzimahcW7FYMZKSr4XA4oMtS+6/c4G4DPYOVUPRkdCO8/TPyV6GMWmFP8V7TMYbVUWBvNck9edN1fZoABk8eWG7tjNAVwEccN1xjZJrBMBPsqjaERw67fNDmb+BSLWUr9DrOv60D33ujnDtWQj+XOHH/KahxydWkdQADIWdJfB8qxXIFxv5NfHr3gIKg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UU-0004h5-4l for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 18/58] gnu: texinfo-4: Fix [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:10 +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.173243500517737 (code B ref 74290); Sun, 24 Nov 2024 07:57:10 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:45 +0000 Received: from localhost ([127.0.0.1]:60751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U5-0004bq-0n for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tc-0004X0-0p for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:16 -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 1tF7TW-00023G-QM; Sun, 24 Nov 2024 02:56:10 -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=4B7O21e4Ya9ExhiXsAGVMXRIEvNrT7qik/64Z91abLc=; b=JeE0k6wDad6BajQKTvpa RqOV2Rc2rtx/AxtgBq59PN9R/nkaaro5kDzH3RUemzkgxrLOBJkUiRB9uGYFDaEAoVpNPPfzwl267 vwad6AnjZToxXdN7gy0dQd/i3At1iYSOYz3VycAjmw6V9NlpjcG4zOgihbvPQcxmp/dPS0zknjlI/ JDQu8GArfEQjYGpNWNuipv3MJN38POjqJzv4oWWe4d6r72ieSiEctb+MWuf1vjnZIzP0aQWqz0SOU zTXbLGK1bh71LGY6RuGHGv5+HMFnWCet7Wu4wJlv87GYlWCe5JW/mUk8hx3aM++8NqwSYvK9RThwX 61OV98/5tJWLrg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:41 +0100 Message-ID: <0df7f97acfd57a4c72d50058213c2af0a05ea8f8.1732434271.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, 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 98429cb059..13c780897e 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 ( ;;; @@ -169,31 +169,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