From: Josselin Poiret via Guix-patches via <guix-patches@gnu.org>
To: kiasoc5 <kiasoc5@disroot.org>, 63793-done@debbugs.gnu.org
Cc: Felix Lechner <felix.lechner@lease-up.com>
Subject: bug#63793: [PATCH] gnu: sbsigntools: Update to 0.9.5.
Date: Sun, 04 Jun 2023 11:41:23 +0200 [thread overview]
Message-ID: <87bkhvef98.fsf@jpoiret.xyz> (raw)
In-Reply-To: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org>
[-- Attachment #1: Type: text/plain, Size: 3263 bytes --]
Hi,
kiasoc5 via Guix-patches via <guix-patches@gnu.org> writes:
> This fixes a build failure with openssl-3.
>
> * gnu/packages/efi.scm (sbsigntools): Update to 0.9.5.
> [arguments]: Remove trailing #t's. Use Gexps. Use "this-package-input". Simplify lambdas.
> [inputs]: Remove labels.
Thanks for your patch! Pushed as
f72f3a909a41dce5dc4512c30d4cd0673bc6560f with the following best
practices modifications (importantly, note cc-for-target and
search-input-file for bash).
By the way, please enable forceinbodyfrom in git so that a pristine From
field is inserted into your patches, as your mail From list is being
rewritten to comply with your domain's DKIM.
diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm
index 50d52c4d65..499745eba1 100644
--- a/gnu/packages/efi.scm
+++ b/gnu/packages/efi.scm
@@ -114,28 +114,29 @@ (define-public sbsigntools
(base32 "060n6w0dx1mrilhdv482ncckanqz6pdv53piimiki0bm15d2fcp4"))))
(build-system gnu-build-system)
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-more-shebangs
- (lambda _
- (substitute* "lib/ccan.git/tools/create-ccan-tree"
- (("#!/bin/bash")
- (string-append "#!"
- #$(this-package-native-input "bash")
- "/bin/bash")))))
- (add-after 'unpack 'patch
- (lambda _
- (substitute* '("configure.ac"
- "tests/Makefile.am")
- (("/usr/include/efi")
- (string-append #$(this-package-input "gnu-efi")
- "/include/efi"))
- (("/usr/lib/gnuefi")
- (string-append #$(this-package-input "gnu-efi")
- "/lib")))))
- (add-after 'unpack 'setenv
- (lambda _
- (setenv "CC" "gcc"))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-more-shebangs
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (substitute* "lib/ccan.git/tools/create-ccan-tree"
+ (("#!/bin/bash")
+ (string-append "#!"
+ (search-input-file (or native-inputs inputs)
+ "/bin/bash"))))))
+ (add-after 'unpack 'patch
+ (lambda _
+ (substitute* '("configure.ac"
+ "tests/Makefile.am")
+ (("/usr/include/efi")
+ (string-append #$(this-package-input "gnu-efi")
+ "/include/efi"))
+ (("/usr/lib/gnuefi")
+ (string-append #$(this-package-input "gnu-efi")
+ "/lib")))))
+ (add-after 'unpack 'setenv
+ (lambda _
+ (setenv "CC" #$(cc-for-target)))))))
(native-inputs
(list autoconf
automake
--
Josselin Poiret
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 682 bytes --]
next prev parent reply other threads:[~2023-06-04 9:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-29 21:53 [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5 kiasoc5 via Guix-patches via
2023-06-04 9:41 ` Josselin Poiret via Guix-patches via [this message]
2023-06-04 13:54 ` kiasoc5 via Guix-patches via
2023-06-04 15:06 ` Josselin Poiret via Guix-patches via
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bkhvef98.fsf@jpoiret.xyz \
--to=guix-patches@gnu.org \
--cc=63793-done@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=felix.lechner@lease-up.com \
--cc=kiasoc5@disroot.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.