summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2014-06-11 20:54:59 +0000
committerRémi Cardona <remi@gentoo.org>2014-06-11 20:54:59 +0000
commit28b1b65bcd7f9a27133d03a6955cf4f0d9517dd5 (patch)
treeffaba3b3e9f3bfa907dce9e54ac45ec3c50318f5 /sys-libs
parentEnable multilib support, bug #489816. (diff)
downloadgentoo-2-28b1b65bcd7f9a27133d03a6955cf4f0d9517dd5.tar.gz
gentoo-2-28b1b65bcd7f9a27133d03a6955cf4f0d9517dd5.tar.bz2
gentoo-2-28b1b65bcd7f9a27133d03a6955cf4f0d9517dd5.zip
sys-libs/tdb: Add patch to add missing stdbool.h include in tdb.h
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/tdb/ChangeLog6
-rw-r--r--sys-libs/tdb/files/add_missing_stdbool_h_include.patch27
-rw-r--r--sys-libs/tdb/tdb-1.3.0-r1.ebuild5
3 files changed, 35 insertions, 3 deletions
diff --git a/sys-libs/tdb/ChangeLog b/sys-libs/tdb/ChangeLog
index c1d77e1e72c1..536b36bb5c78 100644
--- a/sys-libs/tdb/ChangeLog
+++ b/sys-libs/tdb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/tdb
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.64 2014/06/11 08:07:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.65 2014/06/11 20:54:59 remi Exp $
+
+ 11 Jun 2014; Rémi Cardona <remi@gentoo.org> tdb-1.3.0-r1.ebuild,
+ +files/add_missing_stdbool_h_include.patch:
+ Add patch to add missing stdbool.h include in tdb.h, see bug #511846.
*tdb-1.3.0-r1 (11 Jun 2014)
diff --git a/sys-libs/tdb/files/add_missing_stdbool_h_include.patch b/sys-libs/tdb/files/add_missing_stdbool_h_include.patch
new file mode 100644
index 000000000000..756eaaeebf06
--- /dev/null
+++ b/sys-libs/tdb/files/add_missing_stdbool_h_include.patch
@@ -0,0 +1,27 @@
+From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 23 May 2014 10:08:14 -0700
+Subject: [PATCH] tdb/include: include stdbool.h in tdb.h
+
+Commit db5bda56bf08 (tdb: add TDB_MUTEX_LOCKING support) adds a bool, but does
+not include stdbool.h. This causes any build including tdb.h to fail, at least
+for me with GCC 4.9.0.
+---
+ lib/tdb/include/tdb.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h
+index 5ea5e60..03e429c 100644
+--- a/lib/tdb/include/tdb.h
++++ b/lib/tdb/include/tdb.h
+@@ -31,6 +31,7 @@ extern "C" {
+ #endif
+
+ #include <signal.h>
++#include <stdbool.h>
+
+ /**
+ * @defgroup tdb The tdb API
+--
+1.9.3
+
diff --git a/sys-libs/tdb/tdb-1.3.0-r1.ebuild b/sys-libs/tdb/tdb-1.3.0-r1.ebuild
index a9b82f8a02aa..7dd7adbb86f1 100644
--- a/sys-libs/tdb/tdb-1.3.0-r1.ebuild
+++ b/sys-libs/tdb/tdb-1.3.0-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.0-r1.ebuild,v 1.1 2014/06/11 08:07:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.0-r1.ebuild,v 1.2 2014/06/11 20:54:59 remi Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
-inherit waf-utils multilib-minimal python-single-r1
+inherit waf-utils multilib-minimal python-single-r1 eutils
DESCRIPTION="A simple database API"
HOMEPAGE="http://tdb.samba.org/"
@@ -27,6 +27,7 @@ DEPEND="
WAF_BINARY="${S}/buildtools/bin/waf"
src_prepare() {
+ epatch "${FILESDIR}/add_missing_stdbool_h_include.patch"
multilib_copy_sources
}