Attachment 13131 Details for Bug 12724 – Patch for v4-6-test

[patch] Patch for v4-6-test

tmp46.diff.txt (text/plain), 1.39 KB, created by Stefan Metzmacher on 2017-04-04 14:15:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2017-04-04 14:15:03 UTC

Size: 1.39 KB

patch

obsolete

>From d17ab8e082878d19b6406d12fe37147430f2439e Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>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 <metze@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>
>Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(master): Tue Apr  4 16:10:18 CEST 2017 on sn-devel-144
>
>(similar to commit d1b88c6a6edeab4f85fc110eaa8d15e76c7e1f7b)
>---
> buildtools/wafsamba/samba_python.py | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
>index 057a017..3a04881 100644
>--- a/buildtools/wafsamba/samba_python.py
>+++ b/buildtools/wafsamba/samba_python.py
>@@ -76,6 +76,12 @@ def _check_python_headers(conf, mandatory):
>     else:
>         conf.env['PYTHON_SO_ABI_FLAG'] = ''
> 
>+    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 SAMBA_PYTHON(bld, name,
>                  source='',
>-- 
>1.9.1
>

Flags:

ab: review+

Actions: View

Attachments on bug 12724: 13115 | 13116 | 13131