From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id TTOKEpMhfF9fbQAA0tVLHw (envelope-from ) for ; Tue, 06 Oct 2020 07:49:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IB3JDZMhfF8WGQAAB5/wlQ (envelope-from ) for ; Tue, 06 Oct 2020 07:49:39 +0000 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 E8226940390 for ; Tue, 6 Oct 2020 07:49:38 +0000 (UTC) Received: from localhost ([::1]:42128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPhj7-0003b9-S1 for larch@yhetil.org; Tue, 06 Oct 2020 03:49:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPf8v-0008Ng-OQ for bug-guix@gnu.org; Tue, 06 Oct 2020 01:04:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kPf8t-0008G2-17 for bug-guix@gnu.org; Tue, 06 Oct 2020 01:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kPf8s-0002Kp-Tw for bug-guix@gnu.org; Tue, 06 Oct 2020 01:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43821: [PATCH 1/1] gnu: vlang: Build included tools at package time. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 06 Oct 2020 05:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43821 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 43821@debbugs.gnu.org Received: via spool by 43821-submit@debbugs.gnu.org id=B43821.16019606328941 (code B ref 43821); Tue, 06 Oct 2020 05:04:02 +0000 Received: (at 43821) by debbugs.gnu.org; 6 Oct 2020 05:03:52 +0000 Received: from localhost ([127.0.0.1]:51191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPf8h-0002K8-RC for submit@debbugs.gnu.org; Tue, 06 Oct 2020 01:03:52 -0400 Received: from mail-40136.protonmail.ch ([185.70.40.136]:31848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPf8g-0002Jk-Lg for 43821@debbugs.gnu.org; Tue, 06 Oct 2020 01:03:51 -0400 Date: Tue, 06 Oct 2020 05:03:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1601960624; bh=FFoquIWU/XnYChtJKXBnvmdMFP8Q4eJxA+uooFSG1ZU=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=fK1y8IyJ0ajI+0r8PNkC+nbzVRMRXcJm70DwUQ9fyHETIb+EVzTyizT8SroyPnsgL Oa/mJ2sN4EGVcmn5DqeGgCf9LI7ZWG1cmm4M+ae++ORLDAet9B1RnnOesUzQaNUVNw sRIlm68mSX4+KqVyqQZjyldaq2r+dLXXR6/6UEv4= Message-ID: <20201006050329.6648-2-rprior@protonmail.com> In-Reply-To: <20201006050329.6648-1-rprior@protonmail.com> References: <20201006050329.6648-1-rprior@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-Mailman-Approved-At: Tue, 06 Oct 2020 03:46:15 -0400 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: Ryan Prior , Ryan Prior From: Ryan Prior via Bug reports for GNU Guix X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=protonmail.com header.s=protonmail header.b=fK1y8IyJ; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: 3KxIe/eJ/VfM * gnu/packages/vlang.scm (vlang): Updates build stages. - Moves the cc-patching logic out of check into an explicit "patch-cc" st= age - Adds "build-tools" stage to pre-build the included tools --- gnu/packages/vlang.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index 6f6aa79ce5..47060934d4 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -22,6 +22,7 @@ #:use-module (gnu packages node) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix git-download) @@ -61,6 +62,18 @@ (("rm -rf") "true") (("v self") "v -cc gcc cmd/v")) #t)) + (add-after 'build 'patch-cc + (lambda _ + (let* ((bin "tmp/bin") + (gcc (which "gcc"))) + (mkdir-p bin) + (symlink gcc (string-append bin "/cc")) + (setenv "PATH" (string-append bin ":" (getenv "PATH"))) + #t))) + (add-after 'patch-cc 'build-tools + (lambda _ + (invoke "./v" "build-tools" "-v") + #t)) (add-before 'check 'delete-failing-tests ;; XXX As always, these should eventually be fixed and run. (lambda _ @@ -74,13 +87,8 @@ #t)) (replace 'check (lambda* (#:key tests? #:allow-other-keys) - (let* ((bin "tmp/bin") - (gcc (which "gcc"))) - (when tests? - (mkdir-p bin) - (symlink gcc (string-append bin "/cc")) - (setenv "PATH" (string-append bin ":" (getenv "PATH"))) - (invoke "./v" "test-fixed"))) + (when tests? + (invoke "./v" "test-fixed")) #t)) (replace 'install (lambda _ @@ -121,6 +129,9 @@ (sha256 (base32 "052gp5q2k31r3lci3rx4k0vy0vjdjva64xvrbbihn8lgmw63lc9f= "))))) =20 + ;; For build-tools + ("git" ,git) + ;; For the tests. ("libx11" ,libx11) ("node" ,node) --=20 2.17.1