[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
86/180: gnu: gdb: Patch references to /bin/sh and add debug output.
From: |
guix-commits |
Subject: |
86/180: gnu: gdb: Patch references to /bin/sh and add debug output. |
Date: |
Fri, 29 Oct 2021 15:56:50 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit ea44d8ad51bd56fe0813a068a14cb94ce4b590c8
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
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.
(gdb-9.2)[phases]{patch-paths}: Override phase.
---
gnu/packages/gdb.scm | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index e51e17d..0645729 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)
@@ -35,9 +36,10 @@
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages pkg-config)
+ #:use-module (guix download)
#:use-module ((guix licenses) #:select (gpl3+))
#:use-module (guix packages)
- #:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (srfi srfi-1))
@@ -57,6 +59,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 +69,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 +106,8 @@
(for-each delete-file common)
#t)))))))
(inputs
- `(("expat" ,expat)
+ `(("bash" ,bash)
+ ("expat" ,expat)
("mpfr" ,mpfr)
("gmp" ,gmp)
("readline" ,readline)
@@ -151,6 +163,20 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
(sha256
(base32
"0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments gdb-11)
+ ((#:phases phases)
+ ;; Override the patch-paths phase as the pathstuff.c file was later
+ ;; renamed.
+ `(modify-phases ,phases
+ (replace 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((sh (string-append (assoc-ref inputs "bash")
+ "/bin/sh")))
+ (substitute* '("gdb/gdbsupport/pathstuff.c"
+ "gdb/ser-pipe.c")
+ (("\"/bin/sh\"")
+ (format #f "~s" sh))))))))))
(inputs
(alist-replace "guile" (list guile-2.0)
(package-inputs gdb-10)))))
- 59/180: Revert gstreamer update to 1.19.2., (continued)
- 59/180: Revert gstreamer update to 1.19.2., guix-commits, 2021/10/29
- 69/180: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/29
- 70/180: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/29
- 74/180: gnu: python-keras: Skip a flaky test., guix-commits, 2021/10/29
- 73/180: bluez: Update to 5.61., guix-commits, 2021/10/29
- 77/180: gnu: tzdata: Update to 2021e., guix-commits, 2021/10/29
- 81/180: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/29
- 82/180: gnu: curl: Honor #:tests?., guix-commits, 2021/10/29
- 83/180: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/10/29
- 84/180: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/29
- 86/180: gnu: gdb: Patch references to /bin/sh and add debug output.,
guix-commits <=
- 89/180: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/29
- 90/180: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/29
- 49/180: gnu: e2fsprogs: Update to 1.46.4., guix-commits, 2021/10/29
- 58/180: gnu: polkit: Update to 0.120 and ungraft., guix-commits, 2021/10/29
- 63/180: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/29
- 80/180: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/29
- 85/180: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/29
- 79/180: gnu: diffutils: Fix signal processing., guix-commits, 2021/10/29
- 93/180: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/29
- 94/180: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/29