diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/idutils.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
| download | guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar.gz | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in: gnu/local.mk gnu/packages/databases.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/linux.scm gnu/packages/machine-learning.scm gnu/packages/networking.scm gnu/packages/polkit.scm gnu/packages/pulseaudio.scm gnu/packages/rpc.scm gnu/packages/rust.scm gnu/packages/version-control.scm gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/idutils.scm')
| -rw-r--r-- | gnu/packages/idutils.scm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm index 26472c6900..6d2f003734 100644 --- a/gnu/packages/idutils.scm +++ b/gnu/packages/idutils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2015, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. @@ -36,7 +36,6 @@ (sha256 (base32 "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1")) - (patches (search-patches "diffutils-gets-undeclared.patch")) (modules '((guix build utils))) (snippet '(begin @@ -49,8 +48,15 @@ "# define _IO_IN_BACKUP 0x100\n" "#endif\n\n" "/* BSD stdio derived implementations"))) - #t)))) + + ;; 'gets' is deprecated in glibc 2.33 and its declaration is + ;; no longer visible by default from <stdio.h>. + (substitute* "lib/stdio.in.h" + (("_GL_WARN_ON_USE \\(gets.*") "")))))) (build-system gnu-build-system) + (arguments + ;; XXX: These Gnulib tests fail with GCC 10 and glibc 2.33; skip them. + '(#:make-flags '("XFAIL_TESTS=test-sprintf-posix test-isnanl-nolibm"))) (native-inputs `(("emacs" ,emacs-minimal))) (home-page "https://www.gnu.org/software/idutils/") (synopsis "Identifier database utilities") |