aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-12-27 18:44:57 +0100
committerLudovic Courtès <ludo@gnu.org>2020-12-27 18:44:57 +0100
commit951610567f623512a88ac20b879e00d442f85abe (patch)
treea888e2ff982914adf9486a2238f16a6d05a3d397 /gnu/packages
parentbbd28642727b52a2528b4155f6cbd97072b8b291 (diff)
downloadguix-951610567f623512a88ac20b879e00d442f85abe.tar.gz
guix-951610567f623512a88ac20b879e00d442f85abe.zip
gnu: gdbm: Update to 1.19.
* gnu/packages/patches/gdbm-gcc-compat.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/dbm.scm (gdbm)[source]: Remove 'patches'.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/dbm.scm7
-rw-r--r--gnu/packages/patches/gdbm-gcc-compat.patch16
2 files changed, 3 insertions, 20 deletions
diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm
index 8059d95628..d307914d41 100644
--- a/gnu/packages/dbm.scm
+++ b/gnu/packages/dbm.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2016, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
@@ -134,15 +134,14 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
(define-public gdbm
(package
(name "gdbm")
- (version "1.18.1")
+ (version "1.19")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gdbm/gdbm-"
version ".tar.gz"))
- (patches (search-patches "gdbm-gcc-compat.patch"))
(sha256
(base32
- "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6"))))
+ "1g342f0xhh8xbc8p9vrr34clhxz57589k50dibhp5f9284hi5v9p"))))
(arguments `(#:configure-flags '("--enable-libgdbm-compat"
"--disable-static")))
(build-system gnu-build-system)
diff --git a/gnu/packages/patches/gdbm-gcc-compat.patch b/gnu/packages/patches/gdbm-gcc-compat.patch
deleted file mode 100644
index c2e187834a..0000000000
--- a/gnu/packages/patches/gdbm-gcc-compat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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);
-