GNU bug report logs - #63014
[PATCH core-updates 0/2] Fix bmake build

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63014 in the body.
You can then email your comments to 63014 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: guix-patches <at> gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>
Subject: [PATCH core-updates 0/2] Fix bmake build
Date: Sat, 22 Apr 2023 13:54:41 +0200

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

Message #8 received at 63014 <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: Josselin Poiret <dev <at> jpoiret.xyz>,
	63014 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: bmake: Switch to G-Exps.
Date: Sat, 22 Apr 2023 13:55:36 +0200

* 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

Message #11 received at 63014 <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: Josselin Poiret <dev <at> jpoiret.xyz>,
	63014 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: bmake: Update to 20230321.
Date: Sat, 22 Apr 2023 13:55:37 +0200

* 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

Message #16 received at 63014-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 63013-done <at> debbugs.gnu.org, 63014-done <at> debbugs.gnu.org
Subject: Close
Date: Sat, 22 Apr 2023 22:25:52 +0200

Pushed, thanks!

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.