From 64f2f2572426837492c84e9cbbe2398bdc194d60 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 28 Mar 2017 15:28:21 +0200 Subject: [PATCH] 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 --- buildtools/wafsamba/samba_python.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py index 40b42fc..f80f5be 100644 --- a/buildtools/wafsamba/samba_python.py +++ b/buildtools/wafsamba/samba_python.py @@ -90,13 +90,18 @@ 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_value('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') Build.BuildContext.PYTHON_BUILD_IS_ENABLED = PYTHON_BUILD_IS_ENABLED - def SAMBA_PYTHON(bld, name, source='', deps='', -- 1.9.1