me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gdb: Normalize indentation.

Browse source 
* gnu/packages/gdb.scm (gdb-10): Fix indentation and remove extraneous
newlines.  Remove trailing #t.
(gdb-minimal): Fix indentation.
This commit is contained in:
Maxim Cournoyer 2021-10-14 21:04:42 -04:00
parent 41f058d10d
commit 8a613f9d4e
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 46 additions and 54 deletions

100
gnu/packages/gdb.scm
View file

@ -49,25 +49,22 @@
(name "gdb") (name "gdb")
(version "10.2") (version "10.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-" (uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0aag1c0fw875pvhjg1qp7x8pf6gf92bjv5gcic5716scacyj58da")) "0aag1c0fw875pvhjg1qp7x8pf6gf92bjv5gcic5716scacyj58da"))
(patches (patches
(search-patches "gdb-hurd.patch")))) (search-patches "gdb-hurd.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "debug")) (outputs '("out" "debug"))
(arguments (arguments
`(#:tests? #f ; FIXME "make check" fails on single-processor systems. `(#:tests? #f ; FIXME "make check" fails on single-processor systems.
#:out-of-source? #t #:out-of-source? #t
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -77,34 +74,30 @@
"gdbsupport/pathstuff.cc") "gdbsupport/pathstuff.cc")
(("\"/bin/sh\"") (("\"/bin/sh\"")
(format #f "~s" sh)))))) (format #f "~s" sh))))))
(add-after (add-after 'configure 'post-configure
'configure 'post-configure (lambda _
(lambda _ (for-each patch-makefile-SHELL
(for-each patch-makefile-SHELL (find-files "." "Makefile\\.in"))))
(find-files "." "Makefile\\.in")) (add-after 'install 'remove-libs-already-in-binutils
#t)) (lambda* (#:key native-inputs inputs outputs
(add-after #:allow-other-keys)
'install 'remove-libs-already-in-binutils ;; Like Binutils, GDB installs libbfd, libopcodes, etc.
(lambda* (#:key native-inputs inputs outputs ;; However, this leads to collisions when both are
#:allow-other-keys) ;; installed, and really is none of its business,
;; Like Binutils, GDB installs libbfd, libopcodes, etc. ;; conceptually. So remove them.
;; However, this leads to collisions when both are (let* ((binutils (or (assoc-ref inputs "binutils")
;; installed, and really is none of its business, (assoc-ref native-inputs "binutils")))
;; conceptually. So remove them. (out (assoc-ref outputs "out"))
(let* ((binutils (or (assoc-ref inputs "binutils") (files1 (with-directory-excursion binutils
(assoc-ref native-inputs "binutils"))) (append (find-files "lib")
(out (assoc-ref outputs "out")) (find-files "include"))))
(files1 (with-directory-excursion binutils (files2 (with-directory-excursion out
(append (find-files "lib") (append (find-files "lib")
(find-files "include")))) (find-files "include"))))
(files2 (with-directory-excursion out (common (lset-intersection string=?
(append (find-files "lib") files1 files2)))
(find-files "include")))) (with-directory-excursion out
(common (lset-intersection string=? (for-each delete-file common))))))))
files1 files2)))
(with-directory-excursion out
(for-each delete-file common)
#t)))))))
(inputs (inputs
`(("bash" ,bash) `(("bash" ,bash)
("expat" ,expat) ("expat" ,expat)
@ -123,16 +116,16 @@
;; The Hurd needs -lshouldbeinlibc. ;; The Hurd needs -lshouldbeinlibc.
,@(if (hurd-target?) `(("hurd" ,hurd)) '()))) ,@(if (hurd-target?) `(("hurd" ,hurd)) '())))
(native-inputs (native-inputs
`(("texinfo" ,texinfo) `(("texinfo" ,texinfo)
("dejagnu" ,dejagnu) ("dejagnu" ,dejagnu)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
,@(if (hurd-target?) ,@(if (hurd-target?)
;; When cross-compiling from x86_64-linux, make sure to use a ;; When cross-compiling from x86_64-linux, make sure to use a
;; 32-bit MiG because we assume target i586-pc-gnu. ;; 32-bit MiG because we assume target i586-pc-gnu.
`(("mig" ,(if (%current-target-system) `(("mig" ,(if (%current-target-system)
mig/32-bit mig/32-bit
mig))) mig)))
'()))) '())))
;; TODO: Add support for the GDB_DEBUG_FILE_DIRECTORY environment ;; TODO: Add support for the GDB_DEBUG_FILE_DIRECTORY environment
;; variable in GDB itself instead of relying on some glue code in ;; variable in GDB itself instead of relying on some glue code in
;; the Guix-provided .gdbinit file. ;; the Guix-provided .gdbinit file.
@ -187,8 +180,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
gdb-10) gdb-10)
(define-public gdb-minimal (define-public gdb-minimal
(package/inherit (package/inherit gdb
gdb (name "gdb-minimal")
(name "gdb-minimal") (inputs (fold alist-delete (package-inputs gdb)
(inputs (fold alist-delete (package-inputs gdb) '("libxml2" "ncurses" "python-wrapper" "source-highlight")))))
'("libxml2" "ncurses" "python-wrapper" "source-highlight")))))