[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: guix: ant-build-system: Do not compress jars.
From: |
Ricardo Wurmus |
Subject: |
01/02: guix: ant-build-system: Do not compress jars. |
Date: |
Thu, 14 Dec 2017 18:00:57 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit 1bc147d609014cc86326ff0570dfb58426f1ec73
Author: Ricardo Wurmus <address@hidden>
Date: Wed Dec 13 23:35:13 2017 +0100
guix: ant-build-system: Do not compress jars.
Fixes <https://bugs.gnu.org/29700>.
* guix/build/ant-build-system.scm (strip-jar-timestamps): Do not compress
jar
when repacking.
---
guix/build/ant-build-system.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index a440daf..6ce813a 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -197,9 +197,12 @@ repack them. This is necessary to ensure that archives
are reproducible."
;; first.
(with-directory-excursion dir
(let* ((files (find-files "." ".*" #:directories? #t))
+ ;; To ensure that the reference scanner can detect all
+ ;; store references in the jars we disable compression
+ ;; with the "-0" option.
(command (if (file-exists? manifest)
- `("zip" "-X" ,jar ,manifest ,@files)
- `("zip" "-X" ,jar ,@files))))
+ `("zip" "-0" "-X" ,jar ,manifest ,@files)
+ `("zip" "-0" "-X" ,jar ,@files))))
(unless (zero? (apply system* command))
(error "'zip' failed"))))
(utime jar 0 0)