bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: texinfo-4: Fix [cross-]build with gcc-14 and the 64bit Hurd.

Browse source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen 2024-11-11 15:09:03 +01:00
parent fbf815dc84
commit ef15b48379
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gnu/packages/texinfo.scm
View file

@ -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>
;;;
@ -169,31 +169,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 (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