[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/10: gnu: gzip: Fix FTBFS with glibc >= 2.28.
From: |
Marius Bakke |
Subject: |
04/10: gnu: gzip: Fix FTBFS with glibc >= 2.28. |
Date: |
Sat, 25 Aug 2018 10:30:53 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit c7b87eeda272fcc6c9212452355ad5b4f780bb36
Author: Marius Bakke <address@hidden>
Date: Thu Aug 2 13:54:44 2018 +0200
gnu: gzip: Fix FTBFS with glibc >= 2.28.
* gnu/packages/compression.scm (gzip)[arguments]: Add phase
'patch-for-glibc-2.28'.
---
gnu/packages/compression.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index bdae21f..95cf533 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -225,6 +225,21 @@ adding and extracting files to/from a tar archive.")
'(#:tests? #f
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-for-glibc-2.28
+ (lambda _
+ ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g.
+ ;; "m4-gnulib-libio.patch". This is a phase rather than patch
+ ;; or snippet to work around <https://bugs.gnu.org/32347>.
+ (substitute* (find-files "lib" "\\.c$")
+ (("#if defined _IO_ftrylockfile")
+ "#if defined _IO_EOF_SEEN"))
+ (substitute* "lib/stdio-impl.h"
+ (("^/\\* BSD stdio derived implementations")
+ (string-append "#if !defined _IO_IN_BACKUP && defined
_IO_EOF_SEEN\n"
+ "# define _IO_IN_BACKUP 0x100\n"
+ "#endif\n\n"
+ "/* BSD stdio derived implementations")))
+ #t))
(add-after 'unpack 'use-absolute-name-of-gzip
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "gunzip.in"
- branch core-updates updated (3ea66da -> 27c1df0), Marius Bakke, 2018/08/25
- 10/10: gnu: linux-libre-headers: Update to 4.14.67., Marius Bakke, 2018/08/25
- 09/10: gnu: Remove address@hidden, Marius Bakke, 2018/08/25
- 02/10: gnu: gcc: Fix build with glibc >= 2.28., Marius Bakke, 2018/08/25
- 08/10: gnu: flex: Update bison-for-tests to 3.0.5., Marius Bakke, 2018/08/25
- 07/10: gnu: findutils: Fix build with glibc 2.28., Marius Bakke, 2018/08/25
- 05/10: gnu: coreutils: Update to 8.30., Marius Bakke, 2018/08/25
- 03/10: gnu: m4: Fix FTBFS with glibc >= 2.28., Marius Bakke, 2018/08/25
- 06/10: gnu: grep: Work around test failure with glibc 2.28., Marius Bakke, 2018/08/25
- 01/10: gnu: glibc: Update to 2.28., Marius Bakke, 2018/08/25
- 04/10: gnu: gzip: Fix FTBFS with glibc >= 2.28.,
Marius Bakke <=