oom pushed a commit to branch c++-team
in repository guix.
commit 143389146d9b9d5eafb69c3b47acff28af0e216f
Author: Greg Hogan <c...@greghogan.com>
AuthorDate: Tue Oct 22 18:09:04 2024 +0000
gnu: rdma-core: Remove custom phases.
* gnu/packages/linux.scm (rdma-core)
<#:configure-flags>: Remove generator.
<#:generator>: Add.
<#:phases>: Delete.
[native-inputs]: Remove ninja.
Change-Id: Ic0c2b60203df8a1e79ad1f7a51770c9c5aeaf3fc
---
gnu/packages/linux.scm | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d50f639332..0beaf3d6b9 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -162,7 +162,6 @@
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm)
#:use-module (gnu packages networking)
- #:use-module (gnu packages ninja)
#:use-module (gnu packages nss)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages perl)
@@ -7455,9 +7454,8 @@ from the ntfs-3g package. It is meant to be used in
initrds.")
;; Upstream uses the "ninja" build system and encourage distros
;; to do the same for consistency.
- #:configure-flags (list "-GNinja"
-
- ,@(if (%current-target-system)
+ #:generator "Ninja"
+ #:configure-flags (list ,@(if (%current-target-system)
`((string-append
"-DPKG_CONFIG_EXECUTABLE="
(search-input-file
@@ -7467,18 +7465,9 @@ from the ntfs-3g package. It is meant to be used in
initrds.")
'())
(string-append "-DRST2MAN_EXECUTABLE="
(search-input-file
- %build-inputs
"/bin/rst2man.py")))
- #:phases
- (modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke "ninja"
- "-j" (number->string (parallel-job-count)))))
- (replace 'install
- (lambda _
- (invoke "ninja" "install"))))))
+ %build-inputs
"/bin/rst2man.py")))))
(native-inputs
- (list ninja pkg-config python-wrapper python-docutils)) ;for 'rst2man'
+ (list pkg-config python-wrapper python-docutils)) ;for 'rst2man'
(inputs
(list libnl eudev))
(home-page "https://github.com/linux-rdma/rdma-core";)
