[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: usbguard: Fix warning about 'catch'.
|
From: |
guix-commits |
|
Subject: |
03/03: gnu: usbguard: Fix warning about 'catch'. |
|
Date: |
Thu, 7 May 2020 05:27:02 -0400 (EDT) |
bricewge pushed a commit to branch master
in repository guix.
commit f96ddb60962703eaae5433399905b9d81a99ea13
Author: Brice Waegeneire <address@hidden>
AuthorDate: Thu May 7 11:16:51 2020 +0200
gnu: usbguard: Fix warning about 'catch'.
* gnu/packages/hardware.scm (usbguard)[arguments]: Rename phase
'patch-makefile' to 'patch-build-scripts', patch 'Makefile.in' files
instead of 'Makefile.am' and fix 'catch' include path.
[native-inputs]: Remove 'autoconf' and 'automake'.
---
gnu/packages/hardware.scm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 74fd282..7ca565e 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -400,13 +400,16 @@ applications.")
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'configure 'patch-makefile
- (lambda _
+ (add-after 'unpack 'patch-build-scripts
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "configure"
+ (("/usr/include/catch")
+ (string-append (assoc-ref inputs "catch") "/include")))
;; Do not create log directory.
- (substitute* "Makefile" ((".*/log/usbguard.*") ""))
+ (substitute* "Makefile.in" ((".*/log/usbguard.*") ""))
;; Disable LDAP tests: they use 'sudo'.
- (substitute* "src/Tests/Makefile.am"
- (("WITH_LDAP") "FALSE"))
+ (substitute* "src/Tests/Makefile.in"
+ (("\\$\\(am__append_2\\)") ""))
#t))
(add-after 'install 'delete-static-library
(lambda* (#:key outputs #:allow-other-keys)
@@ -448,8 +451,6 @@ applications.")
("libqb" ,libqb)))
(native-inputs
`(("asciidoc" ,asciidoc)
- ("autoconf" ,autoconf)
- ("automake" ,automake)
("bash-completion" ,bash-completion)
("gdbus-codegen" ,glib "bin")
("umockdev" ,umockdev)