diff mbox series

[bug#46703] 回复： Re: [bug#46703] [PATCH] gnu: add bmake

Message ID QZ-GMnnNuclj89vhmSiC7J0PvEmsjRBaDyU4aiyRmG7072MjVci29V8P2dvYIrony2cyW-qrAsjpz25cTzJnSCJrjcI5ysnwOrhK1pL9P3Y=@protonmail.com
State Accepted
Headers show
Series [bug#46703] 回复： Re: [bug#46703] [PATCH] gnu: add bmake | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

qblade Feb. 28, 2021, 4:27 a.m. UTC 
OK

Comments

Nicolas Goaziou March 2, 2021, 10:58 a.m. UTC | #1 
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,
diff mbox series

Patch

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