08/12: gnu: gdbm: Fix build with GCC 10.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 420ddd0a91d50b3d37003638af8dc19bbef02c01
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Dec 15 23:10:29 2020 +0100

    gnu: gdbm: Fix build with GCC 10.
    
    * gnu/packages/patches/gdbm-gcc-compat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/dbm.scm (gdbm)[source](patches): New field.
---
 gnu/local.mk                               |  1 +
 gnu/packages/dbm.scm                       |  1 +
 gnu/packages/patches/gdbm-gcc-compat.patch | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 924aa4b..81134ea 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1044,6 +1044,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/gdb-hurd.patch                          \
   %D%/packages/patches/gd-fix-tests-on-i686.patch              \
   %D%/packages/patches/gd-brect-bounds.patch                   \
+  %D%/packages/patches/gdbm-gcc-compat.patch                   \
   %D%/packages/patches/gdm-default-session.patch               \
   %D%/packages/patches/genimage-signedness.patch               \
   %D%/packages/patches/geoclue-config.patch                    \
diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm
index 6610a70..8059d95 100644
--- a/gnu/packages/dbm.scm
+++ b/gnu/packages/dbm.scm
@@ -139,6 +139,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their 
data model.")
               (method url-fetch)
               (uri (string-append "mirror://gnu/gdbm/gdbm-"
                                   version ".tar.gz"))
+              (patches (search-patches "gdbm-gcc-compat.patch"))
               (sha256
                (base32
                 "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6"))))
diff --git a/gnu/packages/patches/gdbm-gcc-compat.patch 
b/gnu/packages/patches/gdbm-gcc-compat.patch
new file mode 100644
index 0000000..c2e1878
--- /dev/null
+++ b/gnu/packages/patches/gdbm-gcc-compat.patch
@@ -0,0 +1,16 @@
+Fix build failure with GCC 10 due to duplicate definitions.  It can be
+reproduced on older compilers with -fno-common.
+
+Fix taken from Gentoo: https://bugs.gentoo.org/705898
+
+--- a/src/parseopt.c
++++ b/src/parseopt.c
+@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, 
size_t rmargin)
+ }
+ 
+ char *parseopt_program_name;
+-char *parseopt_program_doc;
+-char *parseopt_program_args;
+ const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
+ void (*parseopt_help_hook) (FILE *stream);
+