diff mbox series

[bug#49025,v4,core-updates,25/36] bash: Make #:configure-flags a G-expression.

Message ID 20210619150458.12057-26-maximedevos@telenet.be
State Accepted
Headers show
Series Support cross-compilation with meson | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

M June 19, 2021, 3:04 p.m. UTC 
This allows using this-package-input later.

* gnu/packages/bash.scm
  (bash)[arguments]<#:configure-flags>: Make this a G-expression
  instead of a raw S-expression.
---
 gnu/packages/bash.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 7e98367bbb..b3af873a66 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -109,15 +109,15 @@  number/base32-hash tuples, directly usable in the 'patch-series' form."
                                   "-DSSH_SOURCE_BASHRC")
                                 " "))
          (configure-flags
-          ``("--with-installed-readline"
-             ,,(string-append "CPPFLAGS=" cppflags)
-             ,(string-append
-               "LDFLAGS=-Wl,-rpath -Wl,"
-               (assoc-ref %build-inputs "readline")
-               "/lib"
-               " -Wl,-rpath -Wl,"
-               (assoc-ref %build-inputs "ncurses")
-               "/lib")))
+          #~`("--with-installed-readline"
+              ,#$(string-append "CPPFLAGS=" cppflags)
+              ,(string-append
+                "LDFLAGS=-Wl,-rpath -Wl,"
+                (assoc-ref %build-inputs "readline")
+                "/lib"
+                " -Wl,-rpath -Wl,"
+                (assoc-ref %build-inputs "ncurses")
+                "/lib")))
          (version "5.1"))
     (package
      (name "bash")
@@ -143,8 +143,8 @@  number/base32-hash tuples, directly usable in the 'patch-series' form."
       `(;; When cross-compiling, `configure' incorrectly guesses that job
         ;; control is missing.
         #:configure-flags ,(if (%current-target-system)
-                               `(cons* "bash_cv_job_control_missing=no"
-                                       ,configure-flags)
+                               #~(cons* "bash_cv_job_control_missing=no"
+                                        #$configure-flags)
                                configure-flags)
 
         ;; Bash is reportedly not parallel-safe.  See, for instance,