diff options
| -rw-r--r-- | sys-libs/tdb/files/add_missing_stdbool_h_include.patch | 27 | ||||
| -rw-r--r-- | sys-libs/tdb/files/tdb-1.3.7-fix.patch | 55 |
2 files changed, 0 insertions, 82 deletions
diff --git a/sys-libs/tdb/files/add_missing_stdbool_h_include.patch b/sys-libs/tdb/files/add_missing_stdbool_h_include.patch deleted file mode 100644 index 756eaaeebf06..000000000000 --- a/sys-libs/tdb/files/add_missing_stdbool_h_include.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/files/tdb-1.3.7-fix.patch b/sys-libs/tdb/files/tdb-1.3.7-fix.patch deleted file mode 100644 index bfbd8ab70a98..000000000000 --- a/sys-libs/tdb/files/tdb-1.3.7-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -From patchwork Thu Jul 23 05:10:38 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: tdb: Fix broken build with --disable-python -Date: Thu, 23 Jul 2015 04:10:38 -0000 -From: Martin Schwenke <martin@meltin.net> -X-Patchwork-Id: 11098 -Message-Id: <20150723151038.617e1c49@martins.ozlabs.org> -To: Samba Technical <samba-technical@lists.samba.org> - -Please NACK if you don't want this pushed... :-) - -peace & happiness, -martin - - ->From c7609c35b6bdb488b74d63ebfd27838b9b8e7e2f Mon Sep 17 00:00:00 2001 -From: Martin Schwenke <martin@meltin.net> -Date: Thu, 23 Jul 2015 09:47:24 +1000 -Subject: [PATCH] tdb: Fix broken build with --disable-python - -With --disable-python, we should not install any python files. - -Signed-off-by: Martin Schwenke <martin@meltin.net> -Reviewed-by: Amitay Isaacs <amitay@gmail.com> ---- - lib/tdb/wscript | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/lib/tdb/wscript b/lib/tdb/wscript -index 5845fa0..1822e74 100644 ---- a/lib/tdb/wscript -+++ b/lib/tdb/wscript -@@ -187,12 +187,13 @@ def build(bld): - realname='tdb.so', - cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) - -- for env in bld.gen_python_environments(['PKGCONFIGDIR']): -- bld.SAMBA_SCRIPT('_tdb_text.py', -- pattern='_tdb_text.py', -- installdir='python') -+ if not bld.env.disable_python: -+ for env in bld.gen_python_environments(['PKGCONFIGDIR']): -+ bld.SAMBA_SCRIPT('_tdb_text.py', -+ pattern='_tdb_text.py', -+ installdir='python') - -- bld.INSTALL_FILES('${PYTHONARCHDIR}', '_tdb_text.py') -+ bld.INSTALL_FILES('${PYTHONARCHDIR}', '_tdb_text.py') - - def testonly(ctx): - '''run tdb testsuite''' --- -2.1.4 |