| 1 |
commit: 2a21f609aeffc23219b35a5546e543111b709ff7 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 2 22:10:43 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 2 22:10:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a21f609 |
| 7 |
|
| 8 |
sys-libs/gdbm: Fix building with USE flag "exporter" |
| 9 |
|
| 10 |
Ebuild changes: |
| 11 |
=============== |
| 12 |
- Patch: Add patch to fix build with --enable-gdbm-export. [Bug 625302] [Link 1] |
| 13 |
|
| 14 |
- Already introduced a sub slot to help upgrading to 1.14 later. [Bug 643188] |
| 15 |
|
| 16 |
Link 1: http://git.gnu.org.ua/cgit/gdbm.git/commit/?id=272713d611c55effeaf1d2b45fbb2c69d70e4c74 |
| 17 |
Closes: https://bugs.gentoo.org/625302 |
| 18 |
Bug: https://bugs.gentoo.org/643188 |
| 19 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 20 |
|
| 21 |
...bm-1.13-fix-build-with-enable-gdbm-export.patch | 57 ++++++++++++++++++++++ |
| 22 |
.../{gdbm-1.13-r1.ebuild => gdbm-1.13-r2.ebuild} | 5 +- |
| 23 |
2 files changed, 60 insertions(+), 2 deletions(-) |
| 24 |
|
| 25 |
diff --git a/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch b/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch |
| 26 |
new file mode 100644 |
| 27 |
index 00000000000..eb229f7261c |
| 28 |
--- /dev/null |
| 29 |
+++ b/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch |
| 30 |
@@ -0,0 +1,57 @@ |
| 31 |
+From 272713d611c55effeaf1d2b45fbb2c69d70e4c74 Mon Sep 17 00:00:00 2001 |
| 32 |
+From: Sergey Poznyakoff <gray@×××.org> |
| 33 |
+Date: Sat, 23 Dec 2017 21:27:20 +0000 |
| 34 |
+Subject: Fix build with --enable-gdbm-export |
| 35 |
+ |
| 36 |
+* THANKS: Add Jakub Bogusz |
| 37 |
+* export/export.c: Define GDBM_EXPORT_18 prior to |
| 38 |
+including gdbmexp.c |
| 39 |
+* src/gdbmexp.c [GDBM_EXPORT_18]: Define GDBM_SET_ERRNO and |
| 40 |
+GDBM_ASSERT_CONSISTENCY. |
| 41 |
+--- |
| 42 |
+diff --git a/THANKS b/THANKS |
| 43 |
+index 70cb40f..feb1f87 100644 |
| 44 |
+--- a/THANKS |
| 45 |
++++ b/THANKS |
| 46 |
+@@ -5,6 +5,7 @@ suggesting various improvements or submitting actual code. Here is a list |
| 47 |
+ of these people. Help us keep it complete and exempt of errors. |
| 48 |
+ |
| 49 |
+ Bill Jones <rj7252@×××.com> |
| 50 |
++Jakub Bogusz <qboosh@×××××××××.org> |
| 51 |
+ Matthew Burgess <matthew@××××××××××××××××.org> |
| 52 |
+ Tanaka Akira <akr@××××.org> |
| 53 |
+-Thomas Klausner <tk@×××××××.at> |
| 54 |
+\ No newline at end of file |
| 55 |
++Thomas Klausner <tk@×××××××.at> |
| 56 |
+diff --git a/export/export.c b/export/export.c |
| 57 |
+index 39e05d1..ede4858 100644 |
| 58 |
+--- a/export/export.c |
| 59 |
++++ b/export/export.c |
| 60 |
+@@ -24,6 +24,7 @@ |
| 61 |
+ #include <gdbm.h> |
| 62 |
+ |
| 63 |
+ /* Pull in gdbm_export() */ |
| 64 |
++#define GDBM_EXPORT_18 |
| 65 |
+ #include "gdbmexp.c" |
| 66 |
+ |
| 67 |
+ void |
| 68 |
+diff --git a/src/gdbmexp.c b/src/gdbmexp.c |
| 69 |
+index 457f638..dc46c50 100644 |
| 70 |
+--- a/src/gdbmexp.c |
| 71 |
++++ b/src/gdbmexp.c |
| 72 |
+@@ -21,8 +21,13 @@ |
| 73 |
+ # include "autoconf.h" |
| 74 |
+ # include <arpa/inet.h> |
| 75 |
+ |
| 76 |
++#ifdef GDBM_EXPORT_18 |
| 77 |
++# define GDBM_SET_ERRNO(dbf, ec, fatal) gdbm_errno = ec |
| 78 |
++# define GDBM_ASSERT_CONSISTENCY(dbf, val) |
| 79 |
++#else |
| 80 |
+ # include "gdbmdefs.h" |
| 81 |
+ # include "gdbm.h" |
| 82 |
++#endif |
| 83 |
+ |
| 84 |
+ int |
| 85 |
+ gdbm_export_to_file (GDBM_FILE dbf, FILE *fp) |
| 86 |
+-- |
| 87 |
+cgit v0.9.0.3 |
| 88 |
|
| 89 |
diff --git a/sys-libs/gdbm/gdbm-1.13-r1.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild |
| 90 |
similarity index 93% |
| 91 |
rename from sys-libs/gdbm/gdbm-1.13-r1.ebuild |
| 92 |
rename to sys-libs/gdbm/gdbm-1.13-r2.ebuild |
| 93 |
index 022e74618c7..84c0aeb6a4c 100644 |
| 94 |
--- a/sys-libs/gdbm/gdbm-1.13-r1.ebuild |
| 95 |
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild |
| 96 |
@@ -1,4 +1,4 @@ |
| 97 |
-# Copyright 1999-2017 Gentoo Foundation |
| 98 |
+# Copyright 1999-2018 Gentoo Foundation |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
|
| 101 |
EAPI=6 |
| 102 |
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz |
| 103 |
exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )" |
| 104 |
|
| 105 |
LICENSE="GPL-3" |
| 106 |
-SLOT="0" |
| 107 |
+SLOT="0/1.13" |
| 108 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 109 |
IUSE="+berkdb exporter nls +readline static-libs" |
| 110 |
|
| 111 |
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}" |
| 112 |
|
| 113 |
PATCHES=( |
| 114 |
"${FILESDIR}"/gdbm-1.13-fix-a-typo-in-gdbm.h.patch |
| 115 |
+ "${FILESDIR}"/gdbm-1.13-fix-build-with-enable-gdbm-export.patch |
| 116 |
) |
| 117 |
|
| 118 |
EX_S="${WORKDIR}/${EX_P}" |
Archives