janneke pushed a commit to branch hurd-team
in repository guix.
commit ce6641b6b047bf6a85e87fca794862af9643cb9f
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Sun Nov 3 16:12:31 2024 +0100
gnu: bash-minimal: Fix build for 6bit Hurd.
* gnu/packages/bash-minimal.scm (bash)[arguments]: Do not add
ac_cv_func_dlopen=no to configure-flags.
Change-Id: I3fd2da7a1d9011b155084dceadbad649dbb2a1b9
---
gnu/packages/bash.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 93641a78d5..def86de2ac 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020 Zhu Zihao <[email protected]>
;;; Copyright © 2021 Marius Bakke <[email protected]>
;;; Copyright © 2024 Oleg Pykhalov <[email protected]>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -249,7 +250,12 @@ without modification.")
;; Pretend 'dlopen' is missing so we don't build loadable
;; modules and related code.
- "ac_cv_func_dlopen=no"
+ ,@(if (target-hurd?)
+ ;; Sadly, setting dlopen=no does not (no longer?)
+ ;; prevent that, and it breaks the build on Hurd/gcc-14.
+ ;; Possibly try ac_cv_lib_dl_dlopen=no.
+ '()
+ '("ac_cv_func_dlopen=no"))
,@(if (%current-target-system)
'("bash_cv_job_control_missing=no"
