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 gP6qCIst1F8NXQAA0tVLHw (envelope-from ) for ; Sat, 12 Dec 2020 02:40:11 +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 7hp9BIst1F85VAAA1q6Kng (envelope-from ) for ; Sat, 12 Dec 2020 02:40:11 +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 C666C9402B0 for ; Sat, 12 Dec 2020 02:40:10 +0000 (UTC) Received: from localhost ([::1]:42990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knupN-000725-Ok for larch@yhetil.org; Fri, 11 Dec 2020 21:40:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knupG-00071v-0p for guix-patches@gnu.org; Fri, 11 Dec 2020 21:40:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knupF-0005BD-Oq for guix-patches@gnu.org; Fri, 11 Dec 2020 21:40:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knupF-0002b5-LN for guix-patches@gnu.org; Fri, 11 Dec 2020 21:40: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: Sat, 12 Dec 2020 02:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45191@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16077407949948 (code B ref -1); Sat, 12 Dec 2020 02:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2020 02:39:54 +0000 Received: from localhost ([127.0.0.1]:43761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knup5-0002aG-0g for submit@debbugs.gnu.org; Fri, 11 Dec 2020 21:39:54 -0500 Received: from lists.gnu.org ([209.51.188.17]:37140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knup2-0002Zx-UX for submit@debbugs.gnu.org; Fri, 11 Dec 2020 21:39:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knup2-00071d-NI for guix-patches@gnu.org; Fri, 11 Dec 2020 21:39:48 -0500 Received: from mail-m971.mail.163.com ([123.126.97.1]:35694) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knuod-0004ww-90 for guix-patches@gnu.org; Fri, 11 Dec 2020 21:39:48 -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=Cs0yl I0aIfpNOXbkLopjN/02dlx8Oky8OIlmgzqeauA=; b=BstkMKZ9nTqQ4T8VqUvmt WydS74pFBlYwNgXKle2csu0LNPqkT9tqSRPCDxxY6JWllxFzdlwn7cDqwsodHIEj qtFHkHl3q6R0U275GftWCW3JJWI/6j5ddexD618T7Nih3bIF4HVq9AlogdU57nxg TCyoFC67zWvnViYzzEWW8w= Received: from asus-laptop (unknown [112.93.142.40]) by smtp1 (Coremail) with SMTP id GdxpCgA3Vl1NLdRfgYXXAw--.255S2; Sat, 12 Dec 2020 10:39:10 +0800 (CST) User-agent: mu4e 1.4.13; emacs 27.1 From: Zhu Zihao Date: Sat, 12 Dec 2020 10:39:06 +0800 Message-ID: <867dpnwxx1.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgA3Vl1NLdRfgYXXAw--.255S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU5YLBUUUUU X-Originating-IP: [112.93.142.40] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFA-4r1aD8Vp8GQAAsX Received-SPF: pass client-ip=123.126.97.1; envelope-from=all_but_last@163.com; helo=mail-m971.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.30 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=163.com header.s=s110527 header.b=BstkMKZ9; 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: C666C9402B0 X-Spam-Score: -3.30 X-Migadu-Scanner: scn1.migadu.com X-TUID: jIy7yyfcftCb --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain And fix a trivial issue(wrap phase didn't return #t) --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFJBAEBCAAzFiEE7NCVzXX6efyusptG1SOVn+xGFqYFAl/ULUoVHGFsbF9idXRf bGFzdEAxNjMuY29tAAoJENUjlZ/sRhamSpgH/RZorKVIRgbr6JeyRrtdlXTb1+bX clZ7DzDnsE4fTMFo5KWPe5axqh/PkxcoBeof0SuWWGu/ZB0ZD0POD86YUqmAPFpL t2Hus+GkoFYEJZE+35NmjPpDWhg0uEPnVXwi5HGxTn6Nhkp1iuumRbiW4l88Zv+3 vHn7rI8ut89QwBCjQczdPM6sn0fuEWrAXHTytzCc6YIFnQR8OrQM/bhx71NDGS0s 8+F7yxwKUq17uGm634GjMlgpaO8lUHqNFSKbgXHozq3tC8TRT4XKO2cYIYwsLD5V wcS+V+t65GVUgEgsFwQI5j1f+8K7HiibiLNeu1jWv+7ssvlvp6FyeZ/Znsc= =Sfvt -----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 94664b97a9696f3fd3dc2bbba04979c0f4b6a4d5 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 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4592724867..5805767721 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,15 @@ 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) + (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"))) + #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 -- Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp Zihao --=-=-=--