--- Begin Message ---
Subject: |
[PATCH] Improve reproducibility of package ECL |
Date: |
Sat, 12 Dec 2020 10:39:06 +0800 |
User-agent: |
mu4e 1.4.13; emacs 27.1 |
And fix a trivial issue(wrap phase didn't return #t)
signature.asc
Description: PGP signature
>From cad4e253aefa52cacda5df37970dad6cc32e6600 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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
>From 94664b97a9696f3fd3dc2bbba04979c0f4b6a4d5 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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@protonmail.com>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020 Zhu Zihao <all_but_last@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
--
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp
Zihao
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#45191] [PATCH] Improve reproducibility of package ECL |
Date: |
Mon, 14 Dec 2020 14:55:11 +0100 |
User-agent: |
mu4e 1.4.13; emacs 27.1 |
Pushed as e3f538969ef250b5a4a720834f9f6e54aaf72a19 and following.
Thanks.
signature.asc
Description: PGP signature
--- End Message ---