man-db: fix gnulib issue (#33149)
Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
This commit is contained in:
parent
f9620950cd
commit
dc39edb790
39
var/spack/repos/builtin/packages/man-db/gnulib.patch
Normal file
39
var/spack/repos/builtin/packages/man-db/gnulib.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 84863a1c4dc8cca8fb0f6f670f67779cdd2d543b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bruno Haible <bruno@clisp.org>
|
||||||
|
Date: Sat, 30 Apr 2022 14:09:00 +0200
|
||||||
|
Subject: [PATCH] string: Avoid syntax error on glibc systems with GCC 11.
|
||||||
|
|
||||||
|
Reported by Tom Tromey <tromey@adacore.com> in
|
||||||
|
<https://lists.gnu.org/archive/html/bug-gnulib/2022-04/msg00075.html>
|
||||||
|
and by Satadru Pramanik <satadru@umich.edu> in
|
||||||
|
<https://lists.gnu.org/archive/html/bug-gnulib/2022-04/msg00076.html>.
|
||||||
|
|
||||||
|
* lib/string.in.h (strndup): Don't rededeclare strndup if it is defined
|
||||||
|
as a macro.
|
||||||
|
---
|
||||||
|
ChangeLog | 10 ++++++++++
|
||||||
|
lib/string.in.h | 4 ++--
|
||||||
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/string.in.h b/lib/string.in.h
|
||||||
|
index b6840fa91..33160b252 100644
|
||||||
|
--- a/lib/string.in.h
|
||||||
|
+++ b/lib/string.in.h
|
||||||
|
@@ -583,7 +583,7 @@ _GL_FUNCDECL_RPL (strndup, char *,
|
||||||
|
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||||
|
_GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
|
||||||
|
# else
|
||||||
|
-# if !@HAVE_DECL_STRNDUP@ || __GNUC__ >= 11
|
||||||
|
+# if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup)
|
||||||
|
_GL_FUNCDECL_SYS (strndup, char *,
|
||||||
|
(char const *__s, size_t __n)
|
||||||
|
_GL_ARG_NONNULL ((1))
|
||||||
|
@@ -593,7 +593,7 @@ _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
|
||||||
|
# endif
|
||||||
|
_GL_CXXALIASWARN (strndup);
|
||||||
|
#else
|
||||||
|
-# if __GNUC__ >= 11
|
||||||
|
+# if __GNUC__ >= 11 && !defined strndup
|
||||||
|
/* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */
|
||||||
|
_GL_FUNCDECL_SYS (strndup, char *,
|
||||||
|
(char const *__s, size_t __n)
|
@ -30,6 +30,10 @@ class ManDb(AutotoolsPackage):
|
|||||||
depends_on("gdbm")
|
depends_on("gdbm")
|
||||||
depends_on("groff", type=("build", "link", "run"))
|
depends_on("groff", type=("build", "link", "run"))
|
||||||
|
|
||||||
|
# gnulib bug introduced in commit cbdb5ea63cb5348d9ead16dc46bedda77a4c3d7d.
|
||||||
|
# fix is from commit 84863a1c4dc8cca8fb0f6f670f67779cdd2d543b
|
||||||
|
patch("gnulib.patch", when="@2.10.2", working_dir="gl")
|
||||||
|
|
||||||
# TODO: add gzip support via a new package.
|
# TODO: add gzip support via a new package.
|
||||||
# man pages are typically compressed, include all available
|
# man pages are typically compressed, include all available
|
||||||
# compression libraries
|
# compression libraries
|
||||||
|
Loading…
Reference in New Issue
Block a user