* [bug#63014] [PATCH core-updates 0/2] Fix bmake build
@ 2023-04-22 11:54 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 20:25 ` bug#63014: Close Andreas Enge
0 siblings, 2 replies; 4+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2023-04-22 11:54 UTC (permalink / raw)
To: 63014; +Cc: Josselin Poiret
Hi everyone,
This should fix bmake not building on core-updates, by simply updating it. It
has only one dependent, hikari, which doesn't build because it has not been
updated for newer dependencies.
Best,
Josselin Poiret (2):
gnu: bmake: Switch to G-Exps.
gnu: bmake: Update to 20230321.
gnu/packages/build-tools.scm | 52 ++++++++++++++++++++----------------
1 file changed, 29 insertions(+), 23 deletions(-)
base-commit: 3f7ae420d8a54d4e2ab7f349c40d8930fe9e0771
--
2.39.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#63014] [PATCH 1/2] gnu: bmake: Switch to G-Exps.
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 ` Josselin Poiret via Guix-patches via
2023-04-22 11:55 ` [bug#63014] [PATCH 2/2] gnu: bmake: Update to 20230321 Josselin Poiret via Guix-patches via
2023-04-22 20:25 ` bug#63014: Close Andreas Enge
1 sibling, 1 reply; 4+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2023-04-22 11:55 UTC (permalink / raw)
To: Josselin Poiret, 63014
* gnu/packages/build-tools.scm (bmake): Switch to G-Exps.
---
gnu/packages/build-tools.scm | 43 ++++++++++++++++++------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index e1c9b14bb2..0b0e979faa 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -185,27 +185,28 @@ (define-public bmake
(native-inputs
(list coreutils))
(arguments
- `(#:tests? #f ; test during build
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'fix-test ; fix from nixpkgs
- (lambda _
- (substitute* "unit-tests/unexport-env.mk"
- (("PATH=\t/bin:/usr/bin:/sbin:/usr/sbin")
- "PATH := ${PATH}"))))
- (add-after 'configure 'remove-fail-tests
- (lambda _
- (substitute* "unit-tests/Makefile"
- (("cmd-interrupt") "")
- (("varmod-localtime") "")))))
- #:configure-flags
- (list
- (string-append
- "--with-defshell=" (assoc-ref %build-inputs "bash") "/bin/bash")
- (string-append
- "--with-default-sys-path=" (assoc-ref %outputs "out") "/share/mk"))
- #:make-flags
- (list "INSTALL=install"))) ;; use coreutils install
+ (list
+ #:tests? #f ; test during build
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'configure 'fix-test ; fix from nixpkgs
+ (lambda _
+ (substitute* "unit-tests/unexport-env.mk"
+ (("PATH=\t/bin:/usr/bin:/sbin:/usr/sbin")
+ "PATH := ${PATH}"))))
+ (add-after 'configure 'remove-fail-tests
+ (lambda _
+ (substitute* "unit-tests/Makefile"
+ (("cmd-interrupt") "")
+ (("varmod-localtime") "")))))
+ #:configure-flags
+ #~(list
+ (string-append
+ "--with-defshell=" #$(this-package-input "bash-minimal") "/bin/bash")
+ (string-append
+ "--with-default-sys-path=" #$output "/share/mk"))
+ #:make-flags
+ #~(list "INSTALL=install"))) ;; use coreutils install
(home-page "http://www.crufty.net/help/sjg/bmake.htm")
(synopsis "BSD's make")
(description
base-commit: 3f7ae420d8a54d4e2ab7f349c40d8930fe9e0771
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#63014] [PATCH 2/2] gnu: bmake: Update to 20230321.
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
0 siblings, 0 replies; 4+ messages in thread
From: Josselin Poiret via Guix-patches via @ 2023-04-22 11:55 UTC (permalink / raw)
To: Josselin Poiret, 63014
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#63014: Close
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 20:25 ` Andreas Enge
1 sibling, 0 replies; 4+ messages in thread
From: Andreas Enge @ 2023-04-22 20:25 UTC (permalink / raw)
To: 63013-done, 63014-done
Pushed, thanks!
Andreas
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-22 20:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [bug#63014] [PATCH 2/2] gnu: bmake: Update to 20230321 Josselin Poiret via Guix-patches via
2023-04-22 20:25 ` bug#63014: Close Andreas Enge
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).