[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Apr 4 14:11:02 UTC 2017
The branch, master has been updated
via d1b88c6 wafsamba: move -L/some/path from LINKFLAGS_PYEMBED to LIBPATH_PYEMBED
from a4599b3 s4: server: Fix crash in NTVFS server caused by ordering of destructor calls.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d1b88c6a6edeab4f85fc110eaa8d15e76c7e1f7b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 28 15:28:21 2017 +0200
wafsamba: move -L/some/path from LINKFLAGS_PYEMBED to LIBPATH_PYEMBED
LINKFLAGS should not have path components.
This fixes the build on systems like FreeBSD where python
is located in /usr/local/lib.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12724
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Apr 4 16:10:18 CEST 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_python.py | 6 ++++++
1 file changed, 6 insertions(+)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index 40b42fc..f97439c 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -90,6 +90,12 @@ def _check_python_headers(conf, mandatory):
conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
+ for lib in conf.env['LINKFLAGS_PYEMBED']:
+ if lib.startswith('-L'):
+ conf.env.append_unique('LIBPATH_PYEMBED', lib[2:]) # strip '-L'
+ conf.env['LINKFLAGS_PYEMBED'].remove(lib)
+
+ return
def PYTHON_BUILD_IS_ENABLED(self):
return self.CONFIG_SET('HAVE_PYTHON_H')
--
Samba Shared Repository
More information about the samba-cvs
mailing list