From patchwork Fri Jan 1 19:27:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 26165 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 6184127BC09; Fri, 1 Jan 2021 19:28:40 +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_H4,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 B6EE227BC08 for ; Fri, 1 Jan 2021 19:28:39 +0000 (GMT) Received: from localhost ([::1]:50430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvQ6I-0003dX-Tb for patchwork@mira.cbaines.net; Fri, 01 Jan 2021 14:28:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvQ5k-0003JI-A2 for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kvQ5j-0006mR-FU for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kvQ5j-00052s-Br for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45601] [PATCH 6/6] gnu: vlang: Fix v tools. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Jan 2021 19:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45601@debbugs.gnu.org Received: via spool by 45601-submit@debbugs.gnu.org id=B45601.160952926419331 (code B ref 45601); Fri, 01 Jan 2021 19:28:03 +0000 Received: (at 45601) by debbugs.gnu.org; 1 Jan 2021 19:27:44 +0000 Received: from localhost ([127.0.0.1]:34908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvQ5P-00051i-UQ for submit@debbugs.gnu.org; Fri, 01 Jan 2021 14:27:44 -0500 Received: from mail2.protonmail.ch ([185.70.40.22]:37191) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvQ5O-00050e-8L for 45601@debbugs.gnu.org; Fri, 01 Jan 2021 14:27:42 -0500 Date: Fri, 01 Jan 2021 19:27:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609529255; bh=6xCmklctHlMqWRnmXimDursD7vJvqky1znfsoKI1RZs=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=lsQD/2OrKab9OYB0pCa3f7KfxBntbxI2Yg45y6WyV7dJ3sqZH1ILnHl9hDFGy6cZU /Jy2kThKBzebhjwzYIJmMAAAO3SJecqZ+vqiwVxHTB8i8e3JZPjzkUXfR3OUgdMz8m hwy4Vdmf72F5xHwIngGnzWe58Rra8jlnI7FuLXxc= Message-ID: <20210101192713.23655-6-rprior@protonmail.com> In-Reply-To: <20210101192713.23655-1-rprior@protonmail.com> References: <20210101192713.23655-1-rprior@protonmail.com> MIME-Version: 1.0 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: Ryan Prior , Ryan Prior via Guix-patches X-Patchwork-Original-From: Ryan Prior via Guix-patches via From: Ryan Prior X-getmail-retrieved-from-mailbox: Patches --- gnu/local.mk | 1 + .../vlang-accommodate-timestamps.patch | 50 +++++++++++++++++++ gnu/packages/vlang.scm | 7 +++ 3 files changed, 58 insertions(+) create mode 100644 gnu/packages/patches/vlang-accommodate-timestamps.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2402b1e349..168c499976 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1702,6 +1702,7 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ + %D%/packages/patches/vlang-accommodate-timestamps.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ diff --git a/gnu/packages/patches/vlang-accommodate-timestamps.patch b/gnu/packages/patches/vlang-accommodate-timestamps.patch new file mode 100644 index 0000000000..02171ac6cf --- /dev/null +++ b/gnu/packages/patches/vlang-accommodate-timestamps.patch @@ -0,0 +1,50 @@ +From 64e7c548843c7938fcfa6b697108d28aa26f4d69 Mon Sep 17 00:00:00 2001 +From: Ryan Prior +Date: Thu, 31 Dec 2020 02:31:38 -0600 +Subject: [PATCH] v.util: accomodate reproducible build environments like guix, + by not recompiling cmd/tools when mtime < 1024 (#7702) + +--- + vlib/v/util/util.v | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/vlib/v/util/util.v b/vlib/v/util/util.v +index 811b71585..1ed32bacf 100644 +--- a/vlib/v/util/util.v ++++ b/vlib/v/util/util.v +@@ -179,7 +179,10 @@ pub fn should_recompile_tool(vexe string, tool_source string) bool { + if !os.exists(tool_exe) { + should_compile = true + } else { +- if os.file_last_mod_unix(tool_exe) <= os.file_last_mod_unix(vexe) { ++ mtime_vexe := os.file_last_mod_unix(vexe) ++ mtime_tool_exe := os.file_last_mod_unix(tool_exe) ++ mtime_tool_source := os.file_last_mod_unix(tool_source) ++ if mtime_tool_exe <= mtime_vexe { + // v was recompiled, maybe after v up ... + // rebuild the tool too just in case + should_compile = true +@@ -192,10 +195,19 @@ pub fn should_recompile_tool(vexe string, tool_source string) bool { + should_compile = false + } + } +- if os.file_last_mod_unix(tool_exe) <= os.file_last_mod_unix(tool_source) { ++ if mtime_tool_exe <= mtime_tool_source { + // the user changed the source code of the tool, or git updated it: + should_compile = true + } ++ // GNU Guix and possibly other environments, have bit for bit reproducibility in mind, ++ // including filesystem attributes like modification times, so they set the modification ++ // times of executables to a small number like 0, 1 etc. In this case, we should not ++ // recompile even if other heuristics say that we should. Users in such environments, ++ // have to explicitly do: `v cmd/tools/vfmt.v`, and/or install v from source, and not ++ // use the system packaged one, if they desire to develop v itself. ++ if mtime_vexe < 1024 && mtime_tool_exe < 1024 { ++ should_compile = false ++ } + } + return should_compile + } +-- +2.29.2 + diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index 92d178a3e1..3bdbf36f9d 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages javascript) #:use-module (gnu packages xorg) + #:use-module (gnu packages) #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -61,6 +62,12 @@ (sha256 (base32 "1x2sf2j6xl11kjvv0i0anjqwsfb1la11xr7yhdnbix9808442wm2")) (modules '((guix build utils))) + ;; This patch is already accepted upstream but is required for version + ;; 0.2. The package will build without it, but it will fail to run any v + ;; tools afterwards because of how Guix changes modified timestamps in + ;; the package files. + (patches (search-patches + "vlang-accommodate-timestamps.patch")) (snippet '(begin ;; Eventually remove the whole thirdparty directory.