diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2017-03-06 19:25:13 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-03-10 07:31:10 +0100 |
| commit | f5cafee0c7a96396798d2b229ff3f9dced1d74f3 (patch) | |
| tree | ff09905726da8ed1f2ce87b05d04be30b71ca998 /buildtools/wafsamba/wafsamba.py | |
| parent | 132cbad9ce6372525581f8115ec4cba92b910b42 (diff) | |
| download | samba-f5cafee0c7a96396798d2b229ff3f9dced1d74f3.tar.gz | |
talloc: use the system pytalloc-util for python3 as well
This involves installing a .pc file for the python3 library as well
To get the .pc file generated and installed is quite a mission, we
have to rework the talloc build system to ensure that the second 'env'
created for EXTRA_PYTHON has everything set up on it, the
TALLOC_VERSION in particular.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Incorportaing fixes by Petr Viktorin <pviktori@redhat.com>
Signed-off-by: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'buildtools/wafsamba/wafsamba.py')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 4a47dbffe02..137cb0e4330 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -144,7 +144,7 @@ def SAMBA_LIBRARY(bld, libname, source, '''define a Samba library''' if pyembed and bld.env['IS_EXTRA_PYTHON']: - public_headers = pc_files = None + public_headers = None if private_library and public_headers: raise Utils.WafError("private library '%s' must not have public header files" % @@ -225,7 +225,7 @@ def SAMBA_LIBRARY(bld, libname, source, if vnum is None and soname is None: raise Utils.WafError("public library '%s' must have a vnum" % libname) - if pc_files is None and not bld.env['IS_EXTRA_PYTHON']: + if pc_files is None: raise Utils.WafError("public library '%s' must have pkg-config file" % libname) if public_headers is None and not bld.env['IS_EXTRA_PYTHON']: @@ -328,7 +328,10 @@ def SAMBA_LIBRARY(bld, libname, source, t.link_name = link_name if pc_files is not None and not private_library: - bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) + if pyembed and bld.env['IS_EXTRA_PYTHON']: + bld.PKG_CONFIG_FILES(pc_files, vnum=vnum, extra_name=bld.env['PYTHON_SO_ABI_FLAG']) + else: + bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): |