[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: lbzip2: Fix building with address@hidden
From: |
Efraim Flashner |
Subject: |
01/01: gnu: lbzip2: Fix building with address@hidden |
Date: |
Sat, 10 Nov 2018 13:08:09 -0500 (EST) |
efraim pushed a commit to branch core-updates
in repository guix.
commit f268b744b84734b374a15feae1f02b9f2c4085c7
Author: Efraim Flashner <address@hidden>
Date: Sat Nov 10 20:07:48 2018 +0200
gnu: lbzip2: Fix building with address@hidden
* gnu/packages/compression.scm (lbzip2)[source]: Add snippet to patch
bundled gnulib for address@hidden
---
gnu/packages/compression.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 7249cf7..41289ad 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -363,7 +363,23 @@ decompression.")
version ".tar.gz"))
(sha256
(base32
- "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6"))))
+ "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; 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))))
(build-system gnu-build-system)
(synopsis "Parallel bzip2 compression utility")
(description