* [bug#46703] [PATCH] gnu: add bmake
@ 2021-02-22 6:33 qblade via Guix-patches via
2021-02-27 14:15 ` Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: qblade via Guix-patches via @ 2021-02-22 6:33 UTC (permalink / raw)
To: 46703
[-- Attachment #1: Type: text/plain, Size: 13 bytes --]
Empty Message
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-add-bmake.patch --]
[-- Type: text/x-patch; name=0001-gnu-add-bmake.patch, Size: 2928 bytes --]
From 24d03e78dc8c2fa9dd82ad20f4c861d4128a7ee5 Mon Sep 17 00:00:00 2001
From: qblade <qblade@protonmail.com>
Date: Mon, 22 Feb 2021 01:24:53 +0000
Subject: [PATCH] gnu: add bmake
* gnu/packages/build-tools.scm (bmake): New variable.
---
gnu/packages/build-tools.scm | 48 ++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 63417e5b81..81299e435c 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2020 Yuval Kogman <nothingmuch@woobling.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,8 @@
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages adns)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages base)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
@@ -481,3 +484,48 @@ besides executing the make build command, updates the JSON compilation
database file corresponding to that build, resulting in a command-line
interface similar to Bear.")
(license license:gpl3)))
+
+(define-public bmake
+ (package
+ (name "bmake")
+ (version "20200902")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1v1v81llsiy8qbpy38nml1x08dhrihwh040pqgwbwb9zy1108b08"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("bash" ,bash-minimal)))
+ (native-inputs
+ `(("coreutils" ,coreutils)))
+ (arguments
+ `(#:tests? #f ;; test in build
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'configure 'fix-test ;; fix from nixpkgs
+ (lambda _
+ (substitute* "unit-tests/unexport-env.mk"
+ (("PATH = /bin:/usr/bin:/sbin:/usr/sbin")
+ "PATH := ${PATH}"))))
+ (add-after 'configure 'remove-fail-test ;; need fix
+ (lambda _
+ (substitute* "unit-tests/Makefile"
+ (("cmd-interrupt")
+ "")))))
+ #: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
+ (home-page "http://www.crufty.net/help/sjg/bmake.htm")
+ (synopsis "BSD's make")
+ (description "Program designed to simplify the maintenance of
+other programs.")
+ (license license:bsd-3)))
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#46703] [PATCH] gnu: add bmake
2021-02-22 6:33 [bug#46703] [PATCH] gnu: add bmake qblade via Guix-patches via
@ 2021-02-27 14:15 ` Nicolas Goaziou
2021-02-28 4:27 ` [bug#46703] 回复: " qblade via Guix-patches via
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Goaziou @ 2021-02-27 14:15 UTC (permalink / raw)
To: 46703; +Cc: qblade
Hello,
qblade via Guix-patches via <guix-patches@gnu.org> writes:
> * gnu/packages/build-tools.scm (bmake): New variable.
Thank you. Some comments follow.
> + (name "bmake")
> + (version "20200902")
There is a newer version available. Could you provide it instead?
I tried to quickly update it (hash
"07n9avzdg6gifrzyddnyzada5s5rzklvbqfpv5drljpxcgpqpvwg") but there are
additional failing tests.
> + (arguments
> + `(#:tests? #f ;; test in build
You need a single semicolon for end-of-line comments. Also (nitpick),
I find ";test during build" clearer.
> + #:phases
> + (modify-phases %standard-phases
> + (add-after 'configure 'fix-test ;; fix from nixpkgs
See above for comment syntax.
> + (description "Program designed to simplify the maintenance of
> +other programs.")
I suggest:
"bmake is a program designed to simplify the maintenance of other
programs. Its input is a list of specifications as to the files upon which
programs and other files depend."
Could you send an updated patch?
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#46703] 回复: Re: [bug#46703] [PATCH] gnu: add bmake
2021-02-27 14:15 ` Nicolas Goaziou
@ 2021-02-28 4:27 ` qblade via Guix-patches via
2021-03-02 10:58 ` Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: qblade via Guix-patches via @ 2021-02-28 4:27 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: 46703
[-- Attachment #1: Type: text/plain, Size: 2 bytes --]
OK
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-bmake.patch --]
[-- Type: text/x-patch; name=0001-gnu-Add-bmake.patch, Size: 3153 bytes --]
From 3f04fd4d572ba8bf141324d60f3b0d3cc6fb2e4f Mon Sep 17 00:00:00 2001
From: qblade <qblade@protonmail.com>
Date: Sun, 28 Feb 2021 02:48:39 +0000
Subject: [PATCH] gnu: Add bmake
* gnu/packages/build-tools.scm (bmake): New variable.
---
gnu/packages/build-tools.scm | 52 ++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 63417e5b81..5cb2e5de5d 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2020 Yuval Kogman <nothingmuch@woobling.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,8 @@
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
#:use-module (gnu packages adns)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
@@ -481,3 +484,52 @@ besides executing the make build command, updates the JSON compilation
database file corresponding to that build, resulting in a command-line
interface similar to Bear.")
(license license:gpl3)))
+
+(define-public bmake
+ (package
+ (name "bmake")
+ (version "20210206")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz"))
+ (sha256
+ (base32
+ "07n9avzdg6gifrzyddnyzada5s5rzklvbqfpv5drljpxcgpqpvwg"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("bash" ,bash-minimal)))
+ (native-inputs
+ `(("coreutils" ,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 ;; need fix
+ (lambda _
+ (substitute* "unit-tests/Makefile"
+ (("cmd-interrupt")
+ ""))
+ (substitute* "unit-tests/Makefile"
+ (("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
+ (home-page "http://www.crufty.net/help/sjg/bmake.htm")
+ (synopsis "BSD's make")
+ (description "bmake is a program designed to simplify the maintenance of
+ other programs. Its input is a list of specifications as to the files upon
+ which programs and other files depend.")
+ (license license:bsd-3)))
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#46703] 回复: Re: [bug#46703] [PATCH] gnu: add bmake
2021-02-28 4:27 ` [bug#46703] 回复: " qblade via Guix-patches via
@ 2021-03-02 10:58 ` Nicolas Goaziou
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2021-03-02 10:58 UTC (permalink / raw)
To: qblade; +Cc: 46703, 46703-done
Hello,
qblade <qblade@protonmail.com> writes:
> Subject: [PATCH] gnu: Add bmake
Applied. Thank you.
> + (add-after 'configure 'remove-fail-tests ;; need fix
> + (lambda _
> + (substitute* "unit-tests/Makefile"
> + (("cmd-interrupt")
> + ""))
> + (substitute* "unit-tests/Makefile"
> + (("varmod-localtime")
> + "")))))
I merged the two substitutions within the same substitute* call.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-02 10:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-22 6:33 [bug#46703] [PATCH] gnu: add bmake qblade via Guix-patches via
2021-02-27 14:15 ` Nicolas Goaziou
2021-02-28 4:27 ` [bug#46703] 回复: " qblade via Guix-patches via
2021-03-02 10:58 ` Nicolas Goaziou
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.