From: Brice Waegeneire <brice@waegenei.re>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 40996-done@debbugs.gnu.org
Subject: bug#40996: [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'.
Date: Thu, 07 May 2020 09:33:04 +0000 [thread overview]
Message-ID: <c31533f70cda131c8fb895a810a562b0@waegenei.re> (raw)
In-Reply-To: <87pnbjpi97.fsf@gnu.org>
On 2020-05-04 20:17, Ludovic Courtès wrote:
> 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…
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
next prev parent reply other threads:[~2020-05-07 9:34 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
2020-05-07 9:33 ` Brice Waegeneire [this message]
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=c31533f70cda131c8fb895a810a562b0@waegenei.re \
--to=brice@waegenei.re \
--cc=40996-done@debbugs.gnu.org \
--cc=ludo@gnu.org \
/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).