From patchwork Sat Jan 18 12:58:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 19860 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 0E03E17A2E; Sat, 18 Jan 2020 13:35:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 208021794A for ; Sat, 18 Jan 2020 13:35:11 +0000 (GMT) Received: from localhost ([::1]:40362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isoFq-00013r-Jw for patchwork@mira.cbaines.net; Sat, 18 Jan 2020 08:35:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42602) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isoFk-00013j-Js for guix-patches@gnu.org; Sat, 18 Jan 2020 08:35:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isoFi-0003mh-73 for guix-patches@gnu.org; Sat, 18 Jan 2020 08:35:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34697) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isoFi-0003md-39 for guix-patches@gnu.org; Sat, 18 Jan 2020 08:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1isoFi-000747-0e for guix-patches@gnu.org; Sat, 18 Jan 2020 08:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38546] [PATCH 02/11] gnu: julia: use SOURCE_DATE_EPOCH for precompilation timestamp References: <87v9qpvbyr.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> In-Reply-To: <87v9qpvbyr.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Resent-From: nixo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Jan 2020 13:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38546 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38546@debbugs.gnu.org Received: via spool by 38546-submit@debbugs.gnu.org id=B38546.157935447927111 (code B ref 38546); Sat, 18 Jan 2020 13:35:01 +0000 Received: (at 38546) by debbugs.gnu.org; 18 Jan 2020 13:34:39 +0000 Received: from localhost ([127.0.0.1]:40667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isoFL-00073D-8u for submit@debbugs.gnu.org; Sat, 18 Jan 2020 08:34:39 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:37330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isoFG-00072x-Sg for 38546@debbugs.gnu.org; Sat, 18 Jan 2020 08:34:38 -0500 Received: by mail-wr1-f46.google.com with SMTP id w15so25285597wru.4 for <38546@debbugs.gnu.org>; Sat, 18 Jan 2020 05:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=VEzOjbQpmoo7l/vVk8Wiqaj3UFvoUUdKYHhv4hTiQcU=; b=vGMrEUiRpKRrNGLAfxdGftI2ZmcMhvVWONR7MPDWQ/M0gTBlvjL6kX2TtdhTNw4e3n UirPksZP493PUOxljV+Zuoc/oqdSNTianu5vz2RFVv9r586gpGh/l37jBmf8pe+l+L7X o6pNN9nUYZ/aTbT1xk10lAYZmpPvZx2Lnh74Iw8yVQ7kXfe+3j+iHsi0N0LevgLRFzy1 603vrz5V8Uq/FYtDlXYWixL2OnnRv4lGygGB9dpOaI0KfU3PzTljvf6k8eACkEJzY2+y kBfLH3Fy+W1QlCpxzNX5Z6J4Uapg+ovnwXVNke3T9+Px3IkTL9fc1FnntwHsEovN16D3 ksVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=VEzOjbQpmoo7l/vVk8Wiqaj3UFvoUUdKYHhv4hTiQcU=; b=g0Pt8uvpI8Xoc6GTvENqrdCkdWTUM4fX9aFPr+9yTEL0eksFzmuOOrwXf4pc0QB+jb BjO9yyVLz7iSqGrhzvEC8zyy0boK3YQ50h2vaTEGqlgDSgmLNy69ErO3FjewOvBR+iZR kApn1UK+mGfA8q9eKywJ7tgAOZScTVqEMengqx0ucniuW7LGKAaYX7D8ibdY9CBndl0J eAcOpIHATykC3Cg7AsUP6OxzzWqX5jB+xSQnWQqDk6SAbJzhAErn8JV0uytBSZhh6JQo qrFuMDXkt//Ai57Kk6Q1PP2+wdCF4b90Bh/yVfyCm1KIPUyEmlA3/dwInHG4t9rRJpnL LzOg== X-Gm-Message-State: APjAAAViQsfWvr2LHS7ouzV/KsX5WSqGxjhNVz6eYgk3ez/h9k7vRXT9 gK7bHU3iSHTBPN5o/sWWFZPB1u0B X-Google-Smtp-Source: APXvYqyRETvRCu36uEOlOPL1nCjVwEnAqPk16LHQx012Da/QfJBpkjjMOfOxKTbQOqYFDDSE3bCxxA== X-Received: by 2002:a5d:6191:: with SMTP id j17mr8042118wru.427.1579354468801; Sat, 18 Jan 2020 05:34:28 -0800 (PST) Received: from guixSD (host146-19-dynamic.50-79-r.retail.telecomitalia.it. [79.50.19.146]) by smtp.gmail.com with ESMTPSA id m10sm38785131wrx.19.2020.01.18.05.34.28 for <38546@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2020 05:34:28 -0800 (PST) From: nixo X-Google-Original-From: nixo Date: Sat, 18 Jan 2020 13:58:37 +0100 Message-ID: <87o8v0vqfw.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/julia-fake-mtime-with-SOURCE_DATE_EPOCH.patch: new file --- gnu/local.mk | 1 + gnu/packages/julia.scm | 4 ++- ...ia-fake-mtime-with-SOURCE_DATE_EPOCH.patch | 29 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/julia-fake-mtime-with-SOURCE_DATE_EPOCH.patch diff --git a/gnu/local.mk b/gnu/local.mk index 00ff3b8d61..fe8634b44d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1010,6 +1010,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ + %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index e4db39afbd..a66309b611 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -191,7 +191,9 @@ version "/julia-" version ".tar.gz")) (sha256 (base32 - "1nwkmr9j55g1zkxdchnid1h022s0is52vx23niksshgvh793g41x")))) + "1nwkmr9j55g1zkxdchnid1h022s0is52vx23niksshgvh793g41x")) + (patches + (search-patches "julia-fake-mtime-with-SOURCE_DATE_EPOCH.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" diff --git a/gnu/packages/patches/julia-fake-mtime-with-SOURCE_DATE_EPOCH.patch b/gnu/packages/patches/julia-fake-mtime-with-SOURCE_DATE_EPOCH.patch new file mode 100644 index 0000000000..467e6d68d1 --- /dev/null +++ b/gnu/packages/patches/julia-fake-mtime-with-SOURCE_DATE_EPOCH.patch @@ -0,0 +1,29 @@ +From e4dc28db1d70819505fd1a68fd9d2bfc4fb61a7d Mon Sep 17 00:00:00 2001 +From: nixo +Date: Fri, 17 Jan 2020 11:28:30 +0100 +Subject: [PATCH] base: loading: support fake mtime with SOURCE_DATE_EPCOCH + +Do this when loading libraries +--- + base/loading.jl | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/base/loading.jl b/base/loading.jl +index 7f11a2d4fc..1b4686d1dc 100644 +--- a/base/loading.jl ++++ b/base/loading.jl +@@ -807,7 +807,10 @@ function _include_dependency(mod::Module, _path::AbstractString) + path = normpath(joinpath(dirname(prev), _path)) + end + if _track_dependencies[] +- push!(_require_dependencies, (mod, path, mtime(path))) ++ push!(_require_dependencies, ++ (mod, path, ++ haskey(ENV, "SOURCE_DATE_EPOCH") ? ++ parse(Float64, ENV["SOURCE_DATE_EPOCH"]) : mtime(path))) + end + return path, prev + end +-- +2.24.1 +