From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KDbcAfxU11+XdgAA0tVLHw (envelope-from ) for ; Mon, 14 Dec 2020 12:05:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4NJZOftU118WOwAA1q6Kng (envelope-from ) for ; Mon, 14 Dec 2020 12:05:15 +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 7106D940463 for ; Mon, 14 Dec 2020 12:05:15 +0000 (UTC) Received: from localhost ([::1]:34830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kolvf-0008Vj-VH for larch@yhetil.org; Mon, 14 Dec 2020 06:22:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kolvW-0008VG-0q for guix-patches@gnu.org; Mon, 14 Dec 2020 06:22:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kolvV-0000Vy-PE for guix-patches@gnu.org; Mon, 14 Dec 2020 06:22:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kolvV-0000Ls-L9 for guix-patches@gnu.org; Mon, 14 Dec 2020 06:22:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45191] [PATCH] Improve reproducibility of package ECL Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Dec 2020 11:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Guillaume Le Vaillant Received: via spool by 45191-submit@debbugs.gnu.org id=B45191.16079448731292 (code B ref 45191); Mon, 14 Dec 2020 11:22:01 +0000 Received: (at 45191) by debbugs.gnu.org; 14 Dec 2020 11:21:13 +0000 Received: from localhost ([127.0.0.1]:51397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kolui-0000Kl-Qs for submit@debbugs.gnu.org; Mon, 14 Dec 2020 06:21:13 -0500 Received: from mail-m971.mail.163.com ([123.126.97.1]:34724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koluf-0000KX-DH for 45191@debbugs.gnu.org; Mon, 14 Dec 2020 06:21:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=UHL2E f5curwD1w7WNtOgwzucEd5PbsTNIeZEDmg/+Ik=; b=D7ruqJAKKDS6UDRXubpsC 6howaCuBvvfGnu5fyLb8EPewUzSgTVLpKN7oPfhybYmVijsEmDy1lTSWvGMlruVp zBYSe5cz4L0xV91QibtapML5sBJx8pLFvl76AhM04eZTfR7gMhSvf44zlwfMYBxG SltkUMSZVqMYfzdmem3hWY= Received: from asus-laptop (unknown [112.93.141.84]) by smtp1 (Coremail) with SMTP id GdxpCgAnw2SdStdfdFOSBQ--.22S2; Mon, 14 Dec 2020 19:21:03 +0800 (CST) References: <867dpnwxx1.fsf@163.com> <87o8ixdekm.fsf@yamatai> User-agent: mu4e 1.4.13; emacs 27.1 From: Zhu Zihao In-reply-to: <87o8ixdekm.fsf@yamatai> Date: Mon, 14 Dec 2020 19:21:01 +0800 Message-ID: <864kko4orm.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgAnw2SdStdfdFOSBQ--.22S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7XF4UZrW5GF4ftF48JrW8JFb_yoW3ZrbEqa srJF4UJr1UJrnrKry5Aw4DXrWjqrsrXrn3JFsrJw47Kr9rZF45XF4kJrWavFn2qF47tr17 GryvyryUCa1rGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRE0PftUUUUU== X-Originating-IP: [112.93.141.84] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiKR36r1Xlyu+0GwABsa 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: , Cc: 45191@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.31 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=163.com header.s=s110527 header.b=D7ruqJAK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 7106D940463 X-Spam-Score: -3.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: W30QcsvDK8Md --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Guillaume Le Vaillant writes: > Zhu Zihao skribis: > >> + (use-modules (ice-9 ftw)) >> + (let* ((lib (string-append (assoc-ref outputs "out") "/lib")) >> + (dir (car (scandir lib (lambda (x) >> + (string-prefix? "ecl-" x)))))) >> + (delete-file (string-append lib "/" dir "/build-stamp"))) > > Wouldn't something like the following suffice? > > --8<---------------cut here---------------start------------->8--- > (delete-file (string-append (assoc-ref outputs "out") > "/lib/ecl-" ,version "/build-stamp")) > --8<---------------cut here---------------end--------------->8--- Changed and submit a new patch now. Actually I hope upstream can help fix this problem[1](e.g. Add a configure option --disable-time-stamp) but get no reply --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCX9dKnRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh9oqgEAkJ4zG2YPrK0nOB5IQjmstZqcQxf7 Bv1SoPGockZAKhUBAILUmeB6ijqT1vnjdMu/wxTDCq+Pdif9I3oscss3KQQJ =Vng6 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-ecl-Return-t-in-wrap-phase.patch >From cad4e253aefa52cacda5df37970dad6cc32e6600 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 12 Dec 2020 10:33:37 +0800 Subject: [PATCH 1/2] gnu: ecl: Return #t in wrap phase. * gnu/packages/lisp.scm(ecl)[arguments]: In phase "wrap", return #t. --- gnu/packages/lisp.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3d446290a7..4592724867 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -280,7 +280,8 @@ interface to the Tk widget system.") (input-path lib "/include")) `("kernel-headers" ,@libraries))) `("LIBRARY_PATH" suffix ,library-directories) - `("LD_LIBRARY_PATH" suffix ,library-directories))))) + `("LD_LIBRARY_PATH" suffix ,library-directories)) + #t))) (add-after 'wrap 'check (assoc-ref %standard-phases 'check)) (add-before 'check 'fix-path-to-ecl (lambda _ -- 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-ecl-Remove-build-stamp-to-improve-reproducibilit.patch Content-Transfer-Encoding: quoted-printable >From 1554e044a3e2eede8bf4637395ca4da2388d8e9e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 12 Dec 2020 10:34:37 +0800 Subject: [PATCH 2/2] gnu: ecl: Remove build-stamp to improve reproducibilit= y. * gnu/packages/lisp.scm(ecl)[arguments]: Add "remove-build-stamp" p= hase. Move "wrap" phase after "remove-build-stamp" phase. --- gnu/packages/lisp.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4592724867..f250e8804b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -16,6 +16,7 @@ ;;; Copyright =C2=A9 2019 Jesse Gildersleve ;;; Copyright =C2=A9 2019, 2020 Guillaume Le Vaillant ;;; Copyright =C2=A9 2020 Marius Bakke +;;; Copyright =C2=A9 2020 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -258,7 +259,12 @@ interface to the Tk widget system.") (contrib-asdf "contrib/asdf/asdf.lisp")) (copy-file guix-asdf contrib-asdf)) #t)) - (add-after 'install 'wrap + (add-after 'install 'remove-build-stamp + (lambda* (#:key outputs #:allow-other-keys) + (delete-file (string-append (assoc-ref outputs "out") + "/lib/ecl-" ,version "/build-stam= p")) + #t)) + (add-after 'remove-build-stamp 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((ecl (assoc-ref outputs "out")) (input-path (lambda (lib path) --=20 2.29.2 --=-=-= Content-Type: text/plain [1]: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/616 -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=--