From 0d674fcf95399292b4a2003df8e2a28909b562a2 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 6 Jul 2017 07:44:28 +0200 Subject: [PATCH] waf: Do not install _ldb_text.py if we have system libldb _ldb_text.py is installed as part of the ldb package and also if you compile Samba with the system ldb version. This way we have have the file twice in the same location and run into file confilcts. This has already been fixed in the past by 60dc26bfe1573265dcbd87b9dd3439f945e57d97 BUG: https://bugzilla.samba.org/show_bug.cgi?id=12882 Signed-off-by: Andreas Schneider --- lib/ldb/wscript | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 7f81fe3..b4ae62a 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -177,12 +177,15 @@ def build(bld): realname='ldb.so', cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - bld.SAMBA_SCRIPT('_ldb_text.py', - pattern='_ldb_text.py', - installdir='python') + # Do only install this file as part of the Samba build if we do not + # use the system libldb! + if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): + for env in bld.gen_python_environments(['PKGCONFIGDIR']): + bld.SAMBA_SCRIPT('_ldb_text.py', + pattern='_ldb_text.py', + installdir='python') - bld.INSTALL_FILES('${PYTHONARCHDIR}', '_ldb_text.py') + bld.INSTALL_FILES('${PYTHONARCHDIR}', '_ldb_text.py') if not bld.CONFIG_SET('USING_SYSTEM_LDB'): if bld.is_install: -- 2.9.4