diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
| commit | 32cd878be0bb7e153fcaa6f3bfa2632867390ff9 (patch) | |
| tree | fc1ff93949817c9d172c84d0410ac9225cad57ae /guix/build | |
| parent | 753425610274ccb59cce13490c096027c61621d0 (diff) | |
| parent | 98bd11cfe7b931e9c6d6bf002a8a225fb7a1025b (diff) | |
| download | guix-32cd878be0bb7e153fcaa6f3bfa2632867390ff9.tar guix-32cd878be0bb7e153fcaa6f3bfa2632867390ff9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/ant-build-system.scm | 7 | ||||
| -rw-r--r-- | guix/build/download.scm | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index a440daf054..6ce813a001 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) diff --git a/guix/build/download.scm b/guix/build/download.scm index 4490d225e6..609a100538 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -308,10 +308,10 @@ host name without trailing dot." (register-tls-record-port record port) ;; Write HTTP requests line by line rather than byte by byte: - ;; <https://bugs.gnu.org/22966>. This is not possible on Guile 2.0. + ;; <https://bugs.gnu.org/22966>. This is possible with Guile >= 2.2. (cond-expand - (guile-2.0 #f) - (else (setvbuf record 'line))) + (guile-2.2 (setvbuf record 'line)) + (else #f)) record))) |