From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id uHwkJFvLQ2QsggAASxT56A (envelope-from ) for ; Sat, 22 Apr 2023 13:56:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id ePT8IlvLQ2QOPwAAG6o9tA (envelope-from ) for ; Sat, 22 Apr 2023 13:56:11 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4C6045DD8 for ; Sat, 22 Apr 2023 13:56:11 +0200 (CEST) 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 Content-Transfer-Encoding: 8bit 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 From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682164571; a=rsa-sha256; cv=none; b=E4SROYnWKUenPDunc+9KYDRZBiDgUOhH2h8A+s4MM4Rly1s70geqxlk1E4lc+0jNAGDl1o wZ1FNHRceLoGKy+FkHwSElYkzNAa69rB/I5xzMxjnjhKva9/kBkIg7glzhVTgZo2Ly23o3 UX7+78R47xx8mZ95VtaB0+KpxZEFikRNfgvSmG3qyiQQJEuAyys7FIlxn53LTDOBtnxcFI iHhB2k5y+OB28i1+JJghQUOqY6gaEmtcBlov01ivVUlQ3wCezZiaTydh3TRFXjjinvNo4A PwCmUufU0icecp1whCiCufe+dh99QdcVGzc/wU3dbcYopQXezHFOaX83k9LQ6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=sPGDyfWp; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682164571; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=vvrWqI33FloaMrwBNPpt0L7VQSh6J6Gpr5H6Mgv5+UU=; b=Pn2iiZ6RGReWugewQRPElHmWZplTPehAZGkQ2ZdYpeTGN+tpyLkm8nvuXROmjmht+i3WAw 28HEUu92v0FQBLz96zbtWkuwYPAJSxEprpV67/HvuL0l+FR9X/++67UfILFN/r/R8UMWjJ JWuejkCQ5c6TAaLBMN3YT8j0Is9ZkMy/2QS1R7WVRIUKH5ubKMEhgXMRWW7Y2NIOZMtJ+s LQ1pWVJOKgyWZqj5NbdJ3u23FL4Tpdoqt+plrTI8s1cCQAe8rT34GtGONxC+ElI6At/3Bk 5kN5C8EwPriy3SuFy8b7ZEzauIPTO5abjODGaK5u+kNg9l2Xghb4Wj2vwisxiw== X-Migadu-Spam-Score: -2.81 X-Spam-Score: -2.81 X-Migadu-Queue-Id: 4C6045DD8 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=sPGDyfWp; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: XVUER5mqiCTl * 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