Attachment 11302 Details for Bug 11424 – Fix for broken build with --disable-python

[patch] Fix for broken build with --disable-python

0001-tdb-Fix-broken-build-with-disable-python.patch (text/plain), 1.65 KB, created by Martin Schwenke on 2015-08-03 10:35:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2015-08-03 10:35:01 UTC

Size: 1.65 KB

patch

obsolete

>From c9f7f96a701fb7d7747ced9b412f8d76a98cc69e 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.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11424
>
>Signed-off-by: Martin Schwenke <martin@meltin.net>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>
>Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
>Autobuild-Date(master): Thu Jul 23 18:50:25 CEST 2015 on sn-devel-104
>
>(cherry picked from commit 509c37da1300b843e089dfcd6657e68fa8c8c746)
>---
> 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.4.6
>

Flags:

martins: review? (amitay)
metze: review+

Actions: View

Attachments on bug 11424: 11302