From patchwork Mon Feb 22 06:33:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: qblade X-Patchwork-Id: 27198 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E789827BC49; Mon, 22 Feb 2021 10:03:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 63D2527BC48 for ; Mon, 22 Feb 2021 10:03:21 +0000 (GMT) Received: from localhost ([::1]:56108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lE83k-00036a-Im for patchwork@mira.cbaines.net; Mon, 22 Feb 2021 05:03:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lE83U-00034Z-0n for guix-patches@gnu.org; Mon, 22 Feb 2021 05:03:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lE83R-0007lS-S3 for guix-patches@gnu.org; Mon, 22 Feb 2021 05:03:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lE83R-0006SZ-PB for guix-patches@gnu.org; Mon, 22 Feb 2021 05:03:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46703] [PATCH] gnu: add bmake Resent-From: qblade Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Feb 2021 10:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46703@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.161398817124803 (code B ref -1); Mon, 22 Feb 2021 10:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Feb 2021 10:02:51 +0000 Received: from localhost ([127.0.0.1]:55677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lE83G-0006Ry-30 for submit@debbugs.gnu.org; Mon, 22 Feb 2021 05:02:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:40378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lE4nL-0007bF-S4 for submit@debbugs.gnu.org; Mon, 22 Feb 2021 01:34:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lE4nL-0006ud-LE for guix-patches@gnu.org; Mon, 22 Feb 2021 01:34:11 -0500 Received: from mail-40137.protonmail.ch ([185.70.40.137]:38311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lE4nF-0004jI-R8 for guix-patches@gnu.org; Mon, 22 Feb 2021 01:34:11 -0500 Date: Mon, 22 Feb 2021 06:33:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1613975639; bh=EuM5qgf5xwCWC5Xuul+TZYk9dgHUM0e5GFxo/AHypgM=; h=Date:To:From:Reply-To:Subject:From; b=WuYd3PW5hNPNkkGoDKrJRY2wwalYV7W9nJW43MgCdOleQMAXM9qTz4Il/Vm4NQjN8 TEUQmAzgfCm1tQPs8902YPT1CMZzPtsEvXxgzF9r4s99+GE9uoGbESNl2QM8MPLON8 WYDhyV9HykkwEgEoNC/VhItbIbsWFeS1Sbb4UNz4= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.137; envelope-from=qblade@protonmail.com; helo=mail-40137.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 22 Feb 2021 05:02:49 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: qblade X-ACL-Warn: , qblade via Guix-patches X-Patchwork-Original-From: qblade via Guix-patches via From: qblade X-getmail-retrieved-from-mailbox: Patches Empty Message From 24d03e78dc8c2fa9dd82ad20f4c861d4128a7ee5 Mon Sep 17 00:00:00 2001 From: qblade 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 ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 qblade ;;; ;;; 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