From: Josselin Poiret via Guix-patches via <guix-patches@gnu.org>
To: Josselin Poiret <dev@jpoiret.xyz>, 63014@debbugs.gnu.org
Subject: [bug#63014] [PATCH 2/2] gnu: bmake: Update to 20230321.
Date: Sat, 22 Apr 2023 13:55:37 +0200 [thread overview]
Message-ID: <d8244badc6d37dcb054a342207c9b60b7a4e8437.1682164537.git.dev@jpoiret.xyz> (raw)
In-Reply-To: <a8dde2e358f7edd46ffd01803de703f8d44ee13b.1682164537.git.dev@jpoiret.xyz>
* gnu/packages/build-tools.scm (bmake): Update to 20230321.
---
gnu/packages/build-tools.scm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 0b0e979faa..bcca229466 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -171,14 +171,14 @@ (define-public bear
(define-public bmake
(package
(name "bmake")
- (version "20211212")
+ (version "20230321")
(source
(origin
(method url-fetch)
(uri (string-append
"http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz"))
(sha256
- (base32 "17lywks7fy5538vwyyvbvxcq5mgnd5si7f2qgw85sgqj7mdr4xdd"))))
+ (base32 "0ml2z9ij674bd4227566n0547pcpxpmimp4xw4hj52kl1265czgd"))))
(build-system gnu-build-system)
(inputs
(list bash-minimal))
@@ -190,14 +190,19 @@ (define-public bmake
#:phases
#~(modify-phases %standard-phases
(add-after 'configure 'fix-test ; fix from nixpkgs
- (lambda _
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
(substitute* "unit-tests/unexport-env.mk"
(("PATH=\t/bin:/usr/bin:/sbin:/usr/sbin")
- "PATH := ${PATH}"))))
+ "PATH := ${PATH}"))
+ (substitute* '("unit-tests/opt-keep-going-indirect.mk"
+ "unit-tests/opt-keep-going-indirect.exp")
+ (("false")
+ (search-input-file (or native-inputs inputs) "/bin/false")))))
(add-after 'configure 'remove-fail-tests
(lambda _
(substitute* "unit-tests/Makefile"
(("cmd-interrupt") "")
+ (("deptgt-interrupt") "")
(("varmod-localtime") "")))))
#:configure-flags
#~(list
--
2.39.2
next prev parent reply other threads:[~2023-04-22 11:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-22 11:54 [bug#63014] [PATCH core-updates 0/2] Fix bmake build Josselin Poiret via Guix-patches via
2023-04-22 11:55 ` [bug#63014] [PATCH 1/2] gnu: bmake: Switch to G-Exps Josselin Poiret via Guix-patches via
2023-04-22 11:55 ` Josselin Poiret via Guix-patches via [this message]
2023-04-22 20:25 ` bug#63014: Close Andreas Enge
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=d8244badc6d37dcb054a342207c9b60b7a4e8437.1682164537.git.dev@jpoiret.xyz \
--to=guix-patches@gnu.org \
--cc=63014@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
/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.