--- Begin Message ---
Subject: |
[PATCH 0/3] Fix usbguard's warning about 'catch'. |
Date: |
Fri, 1 May 2020 15:06:04 +0200 |
This patch fix the issue in usbguard reported by Ludo[0] about warnings from
'catch' using a wrong include path, usguard now use a packaged 'pegtl'
dependency instead of the bundled one.
[0]: https://issues.guix.info/issue/40607#11
Brice Waegeneire (3):
gnu: Add pegtl.
gnu: usbguard: Use packaged 'pegtl'.
gnu: usbguard: Fix warning about 'catch'.
gnu/packages/cpp.scm | 22 ++++++++++++++++++++++
gnu/packages/hardware.scm | 29 ++++++++++++++++++-----------
2 files changed, 40 insertions(+), 11 deletions(-)
--
2.26.0
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'. |
Date: |
Thu, 07 May 2020 09:33:04 +0000 |
User-agent: |
Roundcube Webmail/1.3.8 |
On 2020-05-04 20:17, Ludovic Courtès wrote:
Brice Waegeneire <address@hidden> skribis:
* gnu/packages/hardware.scm (usgbuard)[source]: Get it from git.
[arguments]: Rename phase 'patch-makefile' to 'patch-build-scripts',
adjust it for the source from git and fix 'catch' path.
[native-inputs]: Add 'libtool'.
[...]
(source (origin
- (method url-fetch)
- (uri (string-append
-
"https://github.com/USBGuard/usbguard/releases/download/usbguard-"
- version "/usbguard-" version ".tar.gz"))
- (file-name (git-file-name name version))
- (sha256
- (base32
"0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j"))))
+ (method git-fetch)
In this particular case, perhaps you can keep using the tarball, and
then…
This part has been dropped.
[...]
+ (delete-file "autogen.sh") ; Want network access
+ (substitute* "configure.ac"
+ (("/usr/include/catch")
+ (string-append (assoc-ref inputs "catch")
"/include")))
… modify ‘configure’ directly, since it’s a simple and unambiguous
change. That avoids the extra autotools dependencies (actually
Autoconf
and Automake were unnecessary before, no?).
Autotools dependencies were needed because I was patching Makefile.am
files,
but it's not the case anymore by modifying Makefile.in instead.
Anyway, one way or another, it’s a worthy change, so go for it!
Pushed as f96ddb60962703eaae5433399905b9d81a99ea13.
- Brice
--- End Message ---