The branch, master has been updated
via 509c37d tdb: Fix broken build with --disable-python
from 5f8bad2 tdb_wrap: Use a struct initializer
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 509c37da1300b843e089dfcd6657e68fa8c8c746
Author: Martin Schwenke <[email protected]>
Date: Thu Jul 23 09:47:24 2015 +1000
tdb: Fix broken build with --disable-python
With --disable-python, we should not install any python files.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Thu Jul 23 18:50:25 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/wscript | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
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'''
--
Samba Shared Repository
