From patchwork Sat Apr 22 11:55:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 49372 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 BAF4327BBE9; Sat, 22 Apr 2023 12:56:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6369227BBE2 for ; Sat, 22 Apr 2023 12:56:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqBqW-0006HI-78; Sat, 22 Apr 2023 07:56:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqBqU-0006Gz-7O for guix-patches@gnu.org; Sat, 22 Apr 2023 07:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqBqT-00080k-VT for guix-patches@gnu.org; Sat, 22 Apr 2023 07:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqBqT-0008PB-Pg for guix-patches@gnu.org; Sat, 22 Apr 2023 07:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63014] [PATCH 1/2] gnu: bmake: Switch to G-Exps. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Apr 2023 11:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63014 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 63014@debbugs.gnu.org Received: via spool by 63014-submit@debbugs.gnu.org id=B63014.168216455532289 (code B ref 63014); Sat, 22 Apr 2023 11:56:01 +0000 Received: (at 63014) by debbugs.gnu.org; 22 Apr 2023 11:55:55 +0000 Received: from localhost ([127.0.0.1]:42023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqBqM-0008Oi-Iy for submit@debbugs.gnu.org; Sat, 22 Apr 2023 07:55:54 -0400 Received: from jpoiret.xyz ([206.189.101.64]:52674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqBqJ-0008OD-CO for 63014@debbugs.gnu.org; Sat, 22 Apr 2023 07:55:53 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id A8B761851DF; Sat, 22 Apr 2023 11:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682164549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vvrWqI33FloaMrwBNPpt0L7VQSh6J6Gpr5H6Mgv5+UU=; b=sPGDyfWpSDn52dDtkNbh6uwS34apfeJ2FZDLtrFMXTSkbLIm1kPGzN+50t7m5+evCNt0rn 8ToOV09J/Mql1GjL7ArNQrIpj+hT/nYhOUTQUZlyXYEtWTVkqDnwmhEgvAGuZiSrWj1Pcd aAk/QdF9Mcpz/9f39h5k7VCuMhOwum5b/+3aGe44fhIfXju4FDXixWWctTJeBf2K+ahf/1 /YybJ+qSVWkDQjY0YQ85iTBThHEM7+blvBRlmQevTaYP/dlx0SXLG92XVYSg08mOpVV+34 0SJ/qWhASe3v11Nf2J6t5aG1fzcgnqPTOXVGbjMZAjSvSxTlGre76ZHz5g7gdw== Date: Sat, 22 Apr 2023 13:55:36 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/build-tools.scm (bmake): Switch to G-Exps. --- gnu/packages/build-tools.scm | 43 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 21 deletions(-) base-commit: 3f7ae420d8a54d4e2ab7f349c40d8930fe9e0771 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 From patchwork Sat Apr 22 11:55:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 49373 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 BCD3627BBEA; Sat, 22 Apr 2023 12:56:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2FA6F27BBE2 for ; Sat, 22 Apr 2023 12:56:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqBqW-0006HX-KW; Sat, 22 Apr 2023 07:56:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqBqU-0006H6-Hz for guix-patches@gnu.org; Sat, 22 Apr 2023 07:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqBqU-000815-A9 for guix-patches@gnu.org; Sat, 22 Apr 2023 07:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqBqU-0008PI-61 for guix-patches@gnu.org; Sat, 22 Apr 2023 07:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63014] [PATCH 2/2] gnu: bmake: Update to 20230321. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Apr 2023 11:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63014 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 63014@debbugs.gnu.org Received: via spool by 63014-submit@debbugs.gnu.org id=B63014.168216455532295 (code B ref 63014); Sat, 22 Apr 2023 11:56:02 +0000 Received: (at 63014) by debbugs.gnu.org; 22 Apr 2023 11:55:55 +0000 Received: from localhost ([127.0.0.1]:42025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqBqM-0008Ok-Ur for submit@debbugs.gnu.org; Sat, 22 Apr 2023 07:55:55 -0400 Received: from jpoiret.xyz ([206.189.101.64]:52746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqBqJ-0008OK-Up for 63014@debbugs.gnu.org; Sat, 22 Apr 2023 07:55:53 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 27134185320; Sat, 22 Apr 2023 11:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682164551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8ugWbkx26xjak1bhN9K9bKDqR7T3Y2pSrOXbHk6rCm4=; b=f7JSzpLsPYYBwTGqKPxpx1F8Ms2myeFsLwT2KKaCLr/EWOwO2Yc7cI0EPkJfvh7LCflHk/ v2KXTTy012dsn4zkUZUNxzPtgKhQkUAi3/8OLt26Gir04ardkEp9vADRIFPUVfF2rZ2meK tpjUQXW2nYJ9OJP743jUOKerPU/46JnweQ8G1C5k+263QETbmQF/4g6lnNtWE96fsom6Mf lnFCsSnJyNjqDsPE6bfZSWjJ68tXWnkynqyUqKhhmvwW/Kcmmbhl7hDCGMQAM7ExoPlVZo x718tOA+loj+HIpVDhy7saKyiWfoMvMkQJ5eL/AjRKVbuWoGR+CrNQfNXxVCoA== Date: Sat, 22 Apr 2023 13:55:37 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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