diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-10-15 10:39:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-10-15 10:39:45 +0200 |
| commit | 68b0226b2abc7aa9bf029800699338762e2a2e12 (patch) | |
| tree | 8c04bc87be810ab5149f0ccdb7fbb9a62b65ff1d | |
| parent | f1a9c6e581e3b90713d11801dbab9a611f6fe63a (diff) | |
| download | guix-68b0226b2abc7aa9bf029800699338762e2a2e12.tar guix-68b0226b2abc7aa9bf029800699338762e2a2e12.tar.gz | |
gnu: gcal: Apply Gnulib fixes.
* gnu/packages/gcal.scm (gcal)[modules, snippet]: New fields.
| -rw-r--r-- | gnu/packages/gcal.scm | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gnu/packages/gcal.scm b/gnu/packages/gcal.scm index 425fa1f9a8..32d3849faa 100644 --- a/gnu/packages/gcal.scm +++ b/gnu/packages/gcal.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +32,23 @@ version ".tar.xz")) (sha256 (base32 - "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci")))) + "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci")) + (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) (home-page "https://www.gnu.org/software/gcal/") (synopsis "Calculating and printing a wide variety of calendars") |