From: Alexander Bokovoy Date: Tue, 3 Jul 2018 08:09:12 +0000 (+0300) Subject: wafsamba: install Python modules back to bin/python, not bin/python_modules X-Git-Tag: tdb-1.3.17~1790 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31f8945aa6611160d72b24a0f82c40a2419f1362;p=thirdparty%2Fsamba.git wafsamba: install Python modules back to bin/python, not bin/python_modules Partially revert 80fce353e740c793619005ac102ab07fb5e7d280 which started installing generated Python modules into python_modules directory back in 2013. This, unfortunately, does not work anymore as Python gets quite confused with our setup even when both bin/python and bin/python_modules directories are part of sys.path. Signed-off-by: Alexander Bokovoy Reviewed-by: Andrew Bartlett --- diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py index aecaf7d4de7..bca863bea87 100644 --- a/buildtools/wafsamba/samba_python.py +++ b/buildtools/wafsamba/samba_python.py @@ -153,7 +153,7 @@ def SAMBA_PYTHON(bld, name, source = bld.EXPAND_VARIABLES(source, vars=vars) if realname is not None: - link_name = 'python_modules/%s' % realname + link_name = 'python/%s' % realname else: link_name = None diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 98cfdcebe6c..7aa6b379249 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -65,7 +65,7 @@ def SAMBA_BUILD_ENV(conf): # this allows all of the bin/shared and bin/python targets # to be expressed in terms of build directory paths mkdir_p(os.path.join(conf.env.BUILD_DIRECTORY, 'default')) - for (source, target) in [('shared', 'shared'), ('modules', 'modules'), ('python', 'python_modules')]: + for (source, target) in [('shared', 'shared'), ('modules', 'modules'), ('python', 'python')]: link_target = os.path.join(conf.env.BUILD_DIRECTORY, 'default/' + target) if not os.path.lexists(link_target): os.symlink('../' + source, link_target)