diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-04 09:28:12 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:11 +0200 |
| commit | 5de4787be9f25f4bfa750e3229de7465056702eb (patch) | |
| tree | 573c5debfa8110a5551d4fea0d448596ede9cfd1 /gnu | |
| parent | db24ad715ef05e5d534662d8c0156e767f191687 (diff) | |
gnu: zip: Fix build with gcc-14.
* gnu/packages/compression.scm (zip)[arguments]: Add CC to #:make-flags to
relax gcc-14's strictness. In phase "build" use target "generic" rather than
"generic_gcc".
Change-Id: I21af1acdc550c83e63241811a6586598f187b2ef
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/compression.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 65e545db002..b4c492da5c1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm | |||
| @@ -1943,13 +1943,14 @@ the actual decompression, the other input and output.") | |||
| 1943 | `(#:tests? #f ; no test target | 1943 | `(#:tests? #f ; no test target |
| 1944 | #:make-flags (let ((out (assoc-ref %outputs "out"))) | 1944 | #:make-flags (let ((out (assoc-ref %outputs "out"))) |
| 1945 | (list "-f" "unix/Makefile" | 1945 | (list "-f" "unix/Makefile" |
| 1946 | "CC=gcc -Wno-error=implicit-function-declaration" | ||
| 1946 | (string-append "prefix=" out) | 1947 | (string-append "prefix=" out) |
| 1947 | (string-append "MANDIR=" out "/share/man/man1"))) | 1948 | (string-append "MANDIR=" out "/share/man/man1"))) |
| 1948 | #:phases | 1949 | #:phases |
| 1949 | (modify-phases %standard-phases | 1950 | (modify-phases %standard-phases |
| 1950 | (replace 'build | 1951 | (replace 'build |
| 1951 | (lambda* (#:key (make-flags '()) #:allow-other-keys) | 1952 | (lambda* (#:key (make-flags '()) #:allow-other-keys) |
| 1952 | (apply invoke "make" "generic_gcc" make-flags))) | 1953 | (apply invoke "make" "generic" make-flags))) |
| 1953 | (delete 'configure)))) | 1954 | (delete 'configure)))) |
| 1954 | (home-page "http://www.info-zip.org/Zip.html") | 1955 | (home-page "http://www.info-zip.org/Zip.html") |
| 1955 | (synopsis "Compression and file packing utility") | 1956 | (synopsis "Compression and file packing utility") |
