[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: gnu: gdb: Use 'modify-phases'.
From: |
Ludovic Courtès |
Subject: |
03/04: gnu: gdb: Use 'modify-phases'. |
Date: |
Wed, 09 Sep 2015 21:27:31 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit f19b9b96cda5ff45810f1363ef30df8d163451ad
Author: Ludovic Courtès <address@hidden>
Date: Wed Sep 9 23:08:41 2015 +0200
gnu: gdb: Use 'modify-phases'.
* gnu/packages/gdb.scm (gdb)[arguments]: Use 'modify-phases'.
---
gnu/packages/gdb.scm | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 165f410..5849831 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -47,22 +47,22 @@
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; FIXME "make check" fails on single-processor systems.
- #:phases (alist-cons-after
- 'configure 'post-configure
- (lambda _
- (for-each patch-makefile-SHELL
- (find-files "." "Makefile\\.in")))
- (alist-cons-after
- 'install 'post-install
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Like Binutils, GDB installs libbfd and libopcodes.
- ;; However, this leads to collisions when both are
- ;; installed, and really is none of its business,
- ;; conceptually. So remove them.
- (for-each delete-file
- (find-files (assoc-ref outputs "out")
- "^lib(opcodes|bfd)\\.")))
- %standard-phases))))
+ #:phases (modify-phases %standard-phases
+ (add-after
+ 'configure 'post-configure
+ (lambda _
+ (for-each patch-makefile-SHELL
+ (find-files "." "Makefile\\.in"))))
+ (add-after
+ 'install 'post-install
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Like Binutils, GDB installs libbfd and libopcodes.
+ ;; However, this leads to collisions when both are
+ ;; installed, and really is none of its business,
+ ;; conceptually. So remove them.
+ (for-each delete-file
+ (find-files (assoc-ref outputs "out")
+ "^lib(opcodes|bfd)\\.")))))))
(inputs
`(("expat" ,expat)
("mpfr" ,mpfr)