apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit c2655d38903b71b7b7abda7ad9f9fab2152f2d0d Author: Maxim Cournoyer <[email protected]> AuthorDate: Tue Sep 14 16:09:47 2021 -0400 gnu: gdb: Patch references to /bin/sh and add debug output. * gnu/packages/gdb.scm (gdb-10)[outputs]: Add a debug output. [phases]{patch-paths}: New phase. [inputs]: Add bash. --- gnu/packages/gdb.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index e51e17d..c3cdaf1 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -24,6 +24,7 @@ (define-module (gnu packages gdb) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages hurd) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) @@ -57,6 +58,7 @@ (search-patches "gdb-hurd.patch")))) (build-system gnu-build-system) + (outputs '("out" "debug")) (arguments `(#:tests? #f ; FIXME "make check" fails on single-processor systems. @@ -66,6 +68,14 @@ ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((sh (string-append (assoc-ref inputs "bash") + "/bin/sh"))) + (substitute* '("gdb/ser-pipe.c" + "gdbsupport/pathstuff.cc") + (("\"/bin/sh\"") + (format #f "~s" sh)))))) (add-after 'configure 'post-configure (lambda _ @@ -95,7 +105,8 @@ (for-each delete-file common) #t))))))) (inputs - `(("expat" ,expat) + `(("bash" ,bash) + ("expat" ,expat) ("mpfr" ,mpfr) ("gmp" ,gmp) ("readline" ,readline)
