From: "Ludovic Courtès" <ludo@gnu.org>
To: Brice Waegeneire <brice@waegenei.re>
Cc: 40996@debbugs.gnu.org
Subject: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'.
Date: Mon, 04 May 2020 22:17:24 +0200 [thread overview]
Message-ID: <87pnbjpi97.fsf@gnu.org> (raw)
In-Reply-To: <20200501130930.5888-3-brice@waegenei.re> (Brice Waegeneire's message of "Fri, 1 May 2020 15:09:30 +0200")
Brice Waegeneire <brice@waegenei.re> 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…
[...]
> + (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?).
Anyway, one way or another, it’s a worthy change, so go for it!
Ludo’.
next prev parent reply other threads:[~2020-05-04 20:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 13:06 [bug#40996] [PATCH 0/3] Fix usbguard's warning about 'catch' Brice Waegeneire
2020-05-01 13:09 ` [bug#40996] [PATCH 1/3] gnu: Add pegtl Brice Waegeneire
2020-05-01 13:09 ` [bug#40996] [PATCH 2/3] gnu: usbguard: Use packaged 'pegtl' Brice Waegeneire
2020-05-04 20:13 ` Ludovic Courtès
2020-05-01 13:09 ` [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch' Brice Waegeneire
2020-05-04 20:17 ` Ludovic Courtès [this message]
2020-05-07 9:33 ` bug#40996: " Brice Waegeneire
2020-05-04 20:13 ` [bug#40996] [PATCH 1/3] gnu: Add pegtl Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pnbjpi97.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=40996@debbugs.gnu.org \
--cc=brice@waegenei.re \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).