mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-14 02:50:45 +02:00
Code Releases Activity

gnu: patch: Fix build for the 64bit Hurd.

Browse source 
* gnu/packages/base.scm (patch)[arguments]: When building for the 64bit Hurd,
set #:configure-flags.

Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602
This commit is contained in:
Janneke Nieuwenhuizen 2024-11-04 14:52:49 +01:00
parent 6fa9d0b177
commit d53f374a8a
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
gnu/packages/base.scm
View file

@ -339,27 +339,34 @@ differences.")
"1bk38169c0xh01b0q0zmnrjqz8k9byz3arp4q7q66sn6xwf94nvz"))
(patches (search-patches "patch-hurd-path-max.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
(add-after 'unpack 'copy-gnulib-sources
(lambda _
;; XXX: We copy the source instead of using 'gnulib' as a
;; native input to avoid introducing a dependency cycle.
(copy-recursively #+gnulib "gnulib")
(setenv "GNULIB_SRCDIR"
(string-append (getcwd) "/gnulib/src/gnulib"))))
(add-after 'copy-gnulib-sources 'update-bootstrap-script
(lambda _
(copy-file "gnulib/src/gnulib/build-aux/bootstrap"
"bootstrap")))
(add-after 'unpack 'patch-configure.ac
(lambda _
(substitute* "configure.ac"
;; The gnulib-provided git-version-gen script has a plain
;; shebang of #!/bin/sh; avoid using it.
(("build-aux/git-version-gen" all)
(string-append "sh " all)))))))))
(let ((arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
(add-after 'unpack 'copy-gnulib-sources
(lambda _
;; XXX: We copy the source instead of using 'gnulib' as a
;; native input to avoid introducing a dependency cycle.
(copy-recursively #+gnulib "gnulib")
(setenv "GNULIB_SRCDIR"
(string-append (getcwd) "/gnulib/src/gnulib"))))
(add-after 'copy-gnulib-sources 'update-bootstrap-script
(lambda _
(copy-file "gnulib/src/gnulib/build-aux/bootstrap"
"bootstrap")))
(add-after 'unpack 'patch-configure.ac
(lambda _
(substitute* "configure.ac"
;; The gnulib-provided git-version-gen script has a plain
;; shebang of #!/bin/sh; avoid using it.
(("build-aux/git-version-gen" all)
(string-append "sh " all))))))))))
(if (target-hurd64?)
(substitute-keyword-arguments arguments
((#:configure-flags flags '())
#~(list "--disable-threads"
"gl_cv_func_working_mktime=yes")))
arguments)))
(native-inputs (list autoconf automake bison ed))
(properties '()))))