[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/40: gnu: texinfo-4: Fix build for the 64bit Hurd.
From: |
guix-commits |
Subject: |
37/40: gnu: texinfo-4: Fix build for the 64bit Hurd. |
Date: |
Tue, 12 Nov 2024 11:22:03 -0500 (EST) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 645534e6b891ad98d6d2971cb8dc14acb508aed1
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Nov 11 15:09:03 2024 +0100
gnu: texinfo-4: Fix build for the 64bit Hurd.
* 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 <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 @@ is on expressing the content semantically, avoiding
physical markup commands.")
(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
- 34/40: gnu: commencement: hurd-headers-boot0: Update to 0.9.git20240714., (continued)
- 34/40: gnu: commencement: hurd-headers-boot0: Update to 0.9.git20240714., guix-commits, 2024/11/12
- 10/40: gnu: patch: Fix build for the 64bit Hurd., guix-commits, 2024/11/12
- 20/40: gnu: pciutils: Support the 64bit Hurd., guix-commits, 2024/11/12
- 30/40: gnu: guile-fibers: Fix build for the 64bit Hurd., guix-commits, 2024/11/12
- 31/40: gnu: m4: Fix build for the 64bit Hurd., guix-commits, 2024/11/12
- 38/40: gnu: flex: Fix build for the 64bit Hurd., guix-commits, 2024/11/12
- 13/40: gnu: gcc-13, gcc-14: Support being used as parent for gcc-static., guix-commits, 2024/11/12
- 14/40: DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd., guix-commits, 2024/11/12
- 16/40: gnu: Add libgpg-error-1.50., guix-commits, 2024/11/12
- 33/40: gnu: commencement: mig-boot0: Update to 1.8+git20231217.., guix-commits, 2024/11/12
- 37/40: gnu: texinfo-4: Fix build for the 64bit Hurd.,
guix-commits <=
- 22/40: gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df., guix-commits, 2024/11/12
- 25/40: gnu: rumpkernel: Support the 64bit Hurd., guix-commits, 2024/11/12
- 36/40: gnu: gettext: Fix cross-build shebangs., guix-commits, 2024/11/12
- 11/40: gnu: libxcrypt: Support the 64bit Hurd., guix-commits, 2024/11/12
- 12/40: gnu: libstdc++: Support the 64bit Hurd., guix-commits, 2024/11/12
- 17/40: gnu: libgcrypt: Use libgpg-error-1.50 for the 64bit Hurd., guix-commits, 2024/11/12
- 21/40: gnu: libpciaccess: Support the 64bit Hurd., guix-commits, 2024/11/12
- 23/40: gnu: netdde: Support the 64bit Hurd., guix-commits, 2024/11/12
- 24/40: gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337., guix-commits, 2024/11/12
- 26/40: gnu: hurd: Build fixes for the 64bit Hurd., guix-commits, 2024/11/12