108 lines
4.2 KiB
Diff
108 lines
4.2 KiB
Diff
From c8f013a451cb3ed1917dc9183833978a39f25c05 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Slebodnik <lslebodn@redhat.com>
|
|
Date: Sat, 3 Jun 2017 11:50:48 +0200
|
|
Subject: [PATCH 2/2] Revert "talloc: use the system pytalloc-util for python3
|
|
as well"
|
|
|
|
This reverts commit f5cafee0c7a96396798d2b229ff3f9dced1d74f3.
|
|
---
|
|
lib/talloc/pytalloc-util.pc.in | 4 ++--
|
|
lib/talloc/wscript | 44 ++++++++++++++----------------------------
|
|
2 files changed, 16 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/lib/talloc/pytalloc-util.pc.in b/lib/talloc/pytalloc-util.pc.in
|
|
index 06f83e26aa43b3eafd0364c1603673742c2de63b..b87c94edf20c5325d3cde598bfa914bd478ed815 100644
|
|
--- a/lib/talloc/pytalloc-util.pc.in
|
|
+++ b/lib/talloc/pytalloc-util.pc.in
|
|
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
|
|
libdir=@libdir@
|
|
includedir=@includedir@
|
|
|
|
-Name: pytalloc-util@PYTHON_SO_ABI_FLAG@
|
|
+Name: pytalloc-util
|
|
Description: Utility functions for using talloc objects with Python
|
|
Version: @TALLOC_VERSION@
|
|
-Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util@PYTHON_LIBNAME_SO_ABI_FLAG@
|
|
+Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util@PYTHON_SO_ABI_FLAG@
|
|
Cflags: -I${includedir}
|
|
URL: http://talloc.samba.org/
|
|
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
|
|
index af939104a173208a0e9206b721a514d5b752a655..7f9bad743555b442be30a91bf50cb361bfa0de18 100644
|
|
--- a/lib/talloc/wscript
|
|
+++ b/lib/talloc/wscript
|
|
@@ -48,24 +48,20 @@ def configure(conf):
|
|
|
|
conf.env.disable_python = getattr(Options.options, 'disable_python', False)
|
|
|
|
+ if not conf.env.standalone_talloc:
|
|
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
|
|
+ implied_deps='replace'):
|
|
+ conf.define('USING_SYSTEM_TALLOC', 1)
|
|
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
|
|
+ implied_deps='talloc replace'):
|
|
+ conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
|
|
+
|
|
conf.env.TALLOC_COMPAT1 = False
|
|
if conf.env.standalone_talloc:
|
|
conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
|
|
- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
|
|
- conf.env.TALLOC_VERSION = VERSION
|
|
|
|
conf.CHECK_XSLTPROC_MANPAGES()
|
|
|
|
- conf.CHECK_HEADERS('sys/auxv.h')
|
|
- conf.CHECK_FUNCS('getauxval')
|
|
-
|
|
- conf.SAMBA_CONFIG_H()
|
|
-
|
|
- conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
|
|
-
|
|
- # We need to set everything non-python up before here, because
|
|
- # SAMBA_CHECK_PYTHON makes a copy of conf and we need it set up correctly
|
|
-
|
|
if not conf.env.disable_python:
|
|
# also disable if we don't have the python libs installed
|
|
conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2))
|
|
@@ -74,32 +70,20 @@ def configure(conf):
|
|
Logs.warn('Disabling pytalloc-util as python devel libs not found')
|
|
conf.env.disable_python = True
|
|
|
|
- if not conf.env.standalone_talloc:
|
|
- if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
|
|
- implied_deps='replace'):
|
|
- conf.define('USING_SYSTEM_TALLOC', 1)
|
|
+ conf.CHECK_HEADERS('sys/auxv.h')
|
|
+ conf.CHECK_FUNCS('getauxval')
|
|
|
|
- using_system_pytalloc_util = True
|
|
- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
|
|
- implied_deps='talloc replace'):
|
|
- using_system_pytalloc_util = False
|
|
+ conf.SAMBA_CONFIG_H()
|
|
|
|
- # We need to get a pytalloc-util for all the python versions
|
|
- # we are building for
|
|
- if conf.env['EXTRA_PYTHON']:
|
|
- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
|
|
- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
|
|
- implied_deps='talloc replace'):
|
|
- using_system_pytalloc_util = False
|
|
-
|
|
- if using_system_pytalloc_util:
|
|
- conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
|
|
+ conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
|
|
|
|
|
|
def build(bld):
|
|
bld.RECURSE('lib/replace')
|
|
|
|
if bld.env.standalone_talloc:
|
|
+ bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
|
|
+ bld.env.TALLOC_VERSION = VERSION
|
|
private_library = False
|
|
|
|
# should we also install the symlink to libtalloc1.so here?
|
|
--
|
|
2.13.0
|
|
|