GNU bug report logs - #45191
[PATCH] Improve reproducibility of package ECL

Previous Next

Package: guix-patches;

Reported by: Zhu Zihao <all_but_last <at> 163.com>

Date: Sat, 12 Dec 2020 02:40:01 UTC

Severity: normal

Tags: patch

Done: Guillaume Le Vaillant <glv <at> posteo.net>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 45191 in the body.
You can then email your comments to 45191 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#45191; Package guix-patches. (Sat, 12 Dec 2020 02:40:01 GMT) Full text and rfc822 format available.
Acknowledgement sent to Zhu Zihao <all_but_last <at> 163.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sat, 12 Dec 2020 02:40:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] Improve reproducibility of package ECL
Date: Sat, 12 Dec 2020 10:39:06 +0800

[Message part 1 (text/plain, inline)]
And fix a trivial issue(wrap phase didn't return #t)


[signature.asc (application/pgp-signature, inline)]
[0001-gnu-ecl-Return-t-in-wrap-phase.patch (text/x-patch, inline)]
From cad4e253aefa52cacda5df37970dad6cc32e6600 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
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]<phases>: 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


[0002-gnu-ecl-Remove-build-stamp-to-improve-reproducibilit.patch (text/x-patch, inline)]
From 94664b97a9696f3fd3dc2bbba04979c0f4b6a4d5 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
Date: Sat, 12 Dec 2020 10:34:37 +0800
Subject: [PATCH 2/2] gnu: ecl: Remove build-stamp to improve reproducibility.

* gnu/packages/lisp.scm(ecl)[arguments]<phases>: Add "remove-build-stamp" phase.
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 © 2019 Jesse Gildersleve <jessejohngildersleve <at> protonmail.com>
 ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv <at> posteo.net>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2020 Zhu Zihao <all_but_last <at> 163.com>
 ;;;
 ;;; 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)
-- 
2.29.2


[Message part 5 (text/plain, inline)]

-- 
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp

Zihao
Information forwarded to guix-patches <at> gnu.org:
bug#45191; Package guix-patches. (Sun, 13 Dec 2020 13:25:01 GMT) Full text and rfc822 format available.

Message #8 received at 45191 <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 45191 <at> debbugs.gnu.org
Subject: Re: [bug#45191] [PATCH] Improve reproducibility of package ECL
Date: Sun, 13 Dec 2020 14:24:09 +0100

[Message part 1 (text/plain, inline)]
Zhu Zihao <all_but_last <at> 163.com> 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---

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#45191; Package guix-patches. (Mon, 14 Dec 2020 11:22:01 GMT) Full text and rfc822 format available.

Message #11 received at 45191 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: 45191 <at> debbugs.gnu.org
Subject: Re: [bug#45191] [PATCH] Improve reproducibility of package ECL
Date: Mon, 14 Dec 2020 19:21:01 +0800

[Message part 1 (text/plain, inline)]
Guillaume Le Vaillant writes:

> Zhu Zihao <all_but_last <at> 163.com> 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


[signature.asc (application/pgp-signature, inline)]
[0001-gnu-ecl-Return-t-in-wrap-phase.patch (text/x-patch, inline)]
From cad4e253aefa52cacda5df37970dad6cc32e6600 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
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]<phases>: 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


[0002-gnu-ecl-Remove-build-stamp-to-improve-reproducibilit.patch (text/x-patch, inline)]
From 1554e044a3e2eede8bf4637395ca4da2388d8e9e Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
Date: Sat, 12 Dec 2020 10:34:37 +0800
Subject: [PATCH 2/2] gnu: ecl: Remove build-stamp to improve reproducibility.

* gnu/packages/lisp.scm(ecl)[arguments]<phases>: Add "remove-build-stamp" phase.
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 © 2019 Jesse Gildersleve <jessejohngildersleve <at> protonmail.com>
 ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv <at> posteo.net>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2020 Zhu Zihao <all_but_last <at> 163.com>
 ;;;
 ;;; 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-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)
-- 
2.29.2


[Message part 5 (text/plain, inline)]

[1]: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/616
-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao
Reply sent to Guillaume Le Vaillant <glv <at> posteo.net>:
You have taken responsibility. (Mon, 14 Dec 2020 13:56:02 GMT) Full text and rfc822 format available.
Notification sent to Zhu Zihao <all_but_last <at> 163.com>:
bug acknowledged by developer. (Mon, 14 Dec 2020 13:56:02 GMT) Full text and rfc822 format available.

Message #16 received at 45191-done <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 45191-done <at> debbugs.gnu.org
Subject: Re: [bug#45191] [PATCH] Improve reproducibility of package ECL
Date: Mon, 14 Dec 2020 14:55:11 +0100

[Message part 1 (text/plain, inline)]
Pushed as e3f538969ef250b5a4a720834f9f6e54aaf72a19 and following.
Thanks.

[signature.asc (application/pgp-signature, inline)]
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 12 Jan 2021 12:24:09 GMT) Full text and rfc822 format available.
This bug report was last modified 4 years and 210 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.