[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: cli11: Remove (guix utils) dependency.
From: |
guix-commits |
Subject: |
branch master updated: gnu: cli11: Remove (guix utils) dependency. |
Date: |
Tue, 23 Feb 2021 06:43:34 -0500 |
This is an automated email from the git hooks/post-receive script.
mothacehe pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new b4f2858 gnu: cli11: Remove (guix utils) dependency.
b4f2858 is described below
commit b4f28584d3b2844a91fe9690c8437b5b260d3cc1
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Tue Feb 23 12:39:15 2021 +0100
gnu: cli11: Remove (guix utils) dependency.
* gnu/packages/cpp.scm (cli11)[arguments]: Do not import (guix utils) that
is
not meant to go on the build side.
---
gnu/packages/cpp.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index abb50d8..685dc02 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -928,17 +928,18 @@ conversions to and from strings, iteration and related
functionality.")
`(#:configure-flags
'("-DCLI11_SINGLE_FILE=OFF"
"-DCLI11_BUILD_EXAMPLES=OFF")
- #:imported-modules ,(append %cmake-build-system-modules
- (source-module-closure '((guix utils))))
+ #:imported-modules ,%cmake-build-system-modules
+ #:modules ((guix build cmake-build-system)
+ (guix build utils))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'no-vendor-gtest
(lambda _
- (use-modules (guix utils))
(substitute* "tests/CMakeLists.txt"
- ;; We provide our own googletest, so this is not really a
problem.
- (("message\\(FATAL_ERROR \"You have requested tests be built,
but googletest is not downloaded." msg)
- (string-replace-substring msg "FATAL_ERROR" "TRACE")))
+ ;; We provide our own googletest, so this is not really a
+ ;; problem.
+ (("message\\(FATAL_ERROR \"You have requested")
+ "message(TRACE \"You have requested"))
(substitute* "cmake/AddGoogletest.cmake"
(("^add_subdirectory\\(.*googletest.*$") "find_package(GTest
REQUIRED)")
(("^set_target_properties\\(gtest gtest_main gmock gmock_main")
"")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: cli11: Remove (guix utils) dependency.,
guix-commits <=