[PATCHES] Generate shorter name for extra python files
Lukas Slebodnik
lslebodn at redhat.com
Tue Jul 11 08:50:54 UTC 2017
On (10/07/17 08:33), Andrew Bartlett via samba-technical wrote:
>On Sat, 2017-07-08 at 21:16 +0200, Lukas Slebodnik wrote:
>> On (07/07/17 14:30), Lukas Slebodnik via samba-technical wrote:
>> > On (07/07/17 10:18), Andrew Bartlett wrote:
>> > > OK. Please continue working until it is.
>> > >
>> > > The things we need:
>> > >
>> > > Remove both cpython-35m-x86_64-linux-gnu and 3.5 from
>> > > - ABI/*.sigs files
>> > >
>> >
>> > I am not really sure how are symbols generated in libldb with waf
>> > from files in directory lib/ldb/ABI/ because I am used to different definition
>> > of version symbols in libraries http://ftp.gnu.org/old-gnu/Manuals/ld-2.9.1/html_node/ld_25.html
>> > But IIRC it does not work on all UNIX like systems which are supported by samba.
>> >
>>
>> I played a little bit with waf and python debuger (pdb)
>> And I found how and where is version script(vscript) generated.
>>
>>
>> > Could you describe what is a problematic? Why it is problematic?
>> > And how it should look like?
>> >
>>
>> I just would like to know what is problematic for libpyldb-util generated from
>> standard python and for extra python.
>
>The ABI files, which we use in Samba to check when we add new symbols
>or change function arguments, need not to be dependent on python
>versions, as Samba developers have multiple python3 versions installed,
>but we only want one ABI file.
>
>However, the vscript and the generated library needs to be python
>version specific.
>
>The old code did this by removing the cpython... string from the ABI
>file and symbol names before writing the file. You need to (carefully,
>as it is now a shorter and less unique string) do the same.
>
Here you are.
LS
-------------- next part --------------
From f2bb2c100a0e422e4da8b9de2c915261ca174c90 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Mon, 3 Jul 2017 20:38:53 +0200
Subject: [PATCH 1/7] WAF: Generate shorter name for extra python
Generating different name with different architecture and with the same
version of python is not ideal. pkgconfig files should be architecture
independent and libraries for different architectures are stored in
different directories
e.g. (/usr/lib64, /usr/lib, /usr/lib/x86_64-linux-gnu/ ...)
Therefore it will be simpler to remove architecture from names
/usr/lib64/pkgconfig/pytalloc-util.cpython-36m-x86_64-linux-gnu.pc
vs.
/usr/lib64/pkgconfig/pytalloc-util36.pc
Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
buildtools/wafsamba/samba_python.py | 6 +++---
buildtools/wafsamba/wafsamba.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index f97439c945b4e986bacef39387cf4168d419e158..bfaf5e6250e0ec17e9d300fc7c839bae769cec1e 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -85,10 +85,10 @@ def _check_python_headers(conf, mandatory):
if conf.env['PYTHON_VERSION'] > '3':
abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
+ conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = conf.env['PYTHON_VERSION']
else:
conf.env['PYTHON_SO_ABI_FLAG'] = ''
- conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
- conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
+ conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ''
for lib in conf.env['LINKFLAGS_PYEMBED']:
if lib.startswith('-L'):
@@ -170,7 +170,7 @@ Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON
def pyembed_libname(bld, name, extrapython=False):
if bld.env['PYTHON_SO_ABI_FLAG']:
- return name + bld.env['PYTHON_SO_ABI_FLAG']
+ return name + bld.env['PYTHON_VERSION']
else:
return name
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1bdabf606406641ed4741e344f64b9d1628f0874..f65bbf356082ba10fcb121517a388b053ad3cffe 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -329,7 +329,7 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library:
if pyembed and bld.env['IS_EXTRA_PYTHON']:
- bld.PKG_CONFIG_FILES(pc_files, vnum=vnum, extra_name=bld.env['PYTHON_SO_ABI_FLAG'])
+ bld.PKG_CONFIG_FILES(pc_files, vnum=vnum, extra_name=bld.env['PYTHON_VERSION'])
else:
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
--
2.13.0
From 9a0d19a22bcfc1541a478e358dbf9812ed359d92 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Mon, 3 Jul 2017 21:22:10 +0200
Subject: [PATCH 2/7] talloc: Generate shorter name for extra python
Generating different name with different architecture and with the same
version of python is not ideal. pkgconfig files should be architecture
independent and libraries for different architectures are stored in
different directories
e.g. (/usr/lib64, /usr/lib, /usr/lib/x86_64-linux-gnu/ ...)
Therefore it will be simpler to remove architecture from names
/usr/lib64/pkgconfig/pytalloc-util.cpython-36m-x86_64-linux-gnu.pc
vs.
/usr/lib64/pkgconfig/pytalloc-util36.pc
Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
lib/talloc/pytalloc-util.pc.in | 2 +-
lib/talloc/wscript | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/talloc/pytalloc-util.pc.in b/lib/talloc/pytalloc-util.pc.in
index 06f83e26aa43b3eafd0364c1603673742c2de63b..143dceae0094d3419d4fd3bba8e706047a01805e 100644
--- a/lib/talloc/pytalloc-util.pc.in
+++ b/lib/talloc/pytalloc-util.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: pytalloc-util at PYTHON_SO_ABI_FLAG@
+Name: pytalloc-util at PYTHON_VERSION@
Description: Utility functions for using talloc objects with Python
Version: @TALLOC_VERSION@
Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util at PYTHON_LIBNAME_SO_ABI_FLAG@
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 09f780b48b29e5d75d0fe4380ff3680074cb71c9..2b1fd1ec1392bc976df823c885d72aa9da9e9739 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -82,7 +82,7 @@ def configure(conf):
# 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']
+ name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_VERSION']
if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
implied_deps='talloc replace'):
using_system_pytalloc_util = False
--
2.13.0
From 9d0c1cecedda88ce811d88206b87c1e717f11bb4 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Mon, 3 Jul 2017 21:27:34 +0200
Subject: [PATCH 3/7] ldb: Generate shorter name for extra python
Generating different name with different architecture and with the same
version of python is not ideal. pkgconfig files should be architecture
independent and libraries for different architectures are stored in
different directories
e.g. (/usr/lib64, /usr/lib, /usr/lib/x86_64-linux-gnu/ ...)
Therefore it will be simpler to remove architecture from names
/usr/lib64/pkgconfig/pyldb-util.cpython-36m-x86_64-linux-gnu.pc
vs.
/usr/lib64/pkgconfig/pyldb-util36.pc
Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
lib/ldb/pyldb-util.pc.in | 2 +-
lib/ldb/wscript | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/ldb/pyldb-util.pc.in b/lib/ldb/pyldb-util.pc.in
index 60ec7029260237d6ddd36ccea90fbb4444eaad7d..2480d27cfd87ae261e83b9e5ba6d58bdef6e5d00 100644
--- a/lib/ldb/pyldb-util.pc.in
+++ b/lib/ldb/pyldb-util.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
modulesdir=@LDB_MODULESDIR@
-Name: pyldb-util at PYTHON_SO_ABI_FLAG@
+Name: pyldb-util at PYTHON_VERSION@
Description: Python bindings for LDB
Version: @PACKAGE_VERSION@
Requires: ldb
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 7f81fe3f09803668dd04cfa8275a284cc89f8182..5189ea43fa77d732f606c06738c9ecacd9eb61fc 100644
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -77,7 +77,7 @@ def configure(conf):
# We need to get a pyldb-util for all the python versions
# we are building for
if conf.env['EXTRA_PYTHON']:
- name = 'pyldb-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
+ name = 'pyldb-util' + conf.all_envs['extrapython']['PYTHON_VERSION']
if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
onlyif='talloc tdb tevent',
implied_deps='replace talloc tdb tevent ldb'):
--
2.13.0
From 87c491b36eba00ef0825970183ad8556f50e75cf Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Mon, 10 Jul 2017 13:53:14 +0200
Subject: [PATCH 4/7] build:wafsamba: Use same ABI files for different python
versions
Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
buildtools/wafsamba/samba_abi.py | 14 ++++++++++----
buildtools/wafsamba/wafsamba.py | 4 +++-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 196b468f5b35f096f34dfa6e454f38e00a84ccbe..43d9cd3bd2bd54027913e920631d94cd2cde2880 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -211,7 +211,7 @@ def abi_build_vscript(task):
for f in task.inputs:
fname = f.abspath(task.env)
basename = os.path.basename(fname)
- version = basename[len(task.env.LIBNAME)+1:-len(".sigs")]
+ version = basename[len(task.env.ABI_FILE_PREFIX)+1:-len(".sigs")]
versions.append(version)
abi_process_file(fname, version, symmap)
f = open(tgt, mode='w')
@@ -222,10 +222,15 @@ def abi_build_vscript(task):
f.close()
-def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript, abi_match=None):
+def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript, abi_match=None,
+ abi_file_prefix=None):
'''generate a vscript file for our public libraries'''
if abi_directory:
- source = bld.path.ant_glob('%s/%s-[0-9]*.sigs' % (abi_directory, libname), flat=True)
+ if abi_file_prefix is None:
+ abi_file_prefix = libname
+ pattern = '%s/%s-[0-9]*.sigs' % (abi_directory, abi_file_prefix)
+ source = bld.path.ant_glob(pattern, flat=True)
+
def abi_file_key(path):
return version_key(path[:-len(".sigs")].rsplit("-")[-1])
source = sorted(source.split(), key=abi_file_key)
@@ -247,7 +252,8 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript, abi_match=None):
else:
abi_match = samba_utils.TO_LIST(abi_match)
t.env.ABI_MATCH = abi_match
+ t.env.ABI_FILE_PREFIX = abi_file_prefix
t.env.VERSION = version
t.env.LIBNAME = libname
- t.vars = ['LIBNAME', 'VERSION', 'ABI_MATCH']
+ t.vars = ['LIBNAME', 'VERSION', 'ABI_MATCH', 'ABI_FILE_PREFIX']
Build.BuildContext.ABI_VSCRIPT = ABI_VSCRIPT
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index f65bbf356082ba10fcb121517a388b053ad3cffe..3158fc2754ab8d315c68c6c8fa758d8bce6e3107 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -265,8 +265,10 @@ def SAMBA_LIBRARY(bld, libname, source,
abi_flag = bld.env['PYTHON_SO_ABI_FLAG']
replacement = '.py%s' % bld.env['PYTHON_VERSION'].split('.')[0]
version_libname = libname.replace(abi_flag, replacement)
+ abi_file_prefix = libname.replace(bld.env['PYTHON_VERSION'], '')
else:
version_libname = libname
+ abi_file_prefix = None
vscript = None
if bld.env.HAVE_LD_VERSION_SCRIPT:
@@ -279,7 +281,7 @@ def SAMBA_LIBRARY(bld, libname, source,
if version:
vscript = "%s.vscript" % libname
bld.ABI_VSCRIPT(version_libname, abi_directory, version, vscript,
- abi_match)
+ abi_match, abi_file_prefix)
fullname = apply_pattern(bundled_name, bld.env.shlib_PATTERN)
fullpath = bld.path.find_or_declare(fullname)
vscriptpath = bld.path.find_or_declare(vscript)
--
2.13.0
From da1367a24ffcee89f14392aeede52dbc68bbd9cd Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Tue, 11 Jul 2017 10:11:33 +0200
Subject: [PATCH 5/7] build:wafsamba: Remove unused version_libname
Patch is almost a revert of commit 9ef47d25317947248b0796059e6f0a851ba3cb07
Revert "buildtools: Ignore exact Python version for ABI checking"
Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
buildtools/wafsamba/samba_abi.py | 3 +--
buildtools/wafsamba/wafsamba.py | 9 ++-------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 43d9cd3bd2bd54027913e920631d94cd2cde2880..f92686b8757a6ba3144ceca0ddb59031f25348ce 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -137,8 +137,7 @@ def abi_check(self):
topsrc = self.bld.srcnode.abspath()
abi_gen = os.path.join(topsrc, 'buildtools/scripts/abi_gen.sh')
- abi_file = "%s/%s-%s.sigs" % (self.abi_directory, self.version_libname,
- self.vnum)
+ abi_file = "%s/%s-%s.sigs" % (self.abi_directory, self.name, self.vnum)
tsk = self.create_task('abi_check', self.link_task.outputs[0])
tsk.ABI_FILE = abi_file
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 3158fc2754ab8d315c68c6c8fa758d8bce6e3107..6b1b336334e841969ce73975ea5d608f28f93bc5 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -261,13 +261,9 @@ def SAMBA_LIBRARY(bld, libname, source,
if pyembed and bld.env['PYTHON_SO_ABI_FLAG']:
# For ABI checking, we don't care about the exact Python version.
- # Replace the Python ABI tag (e.g. ".cpython-35m") by a generic ".py3"
- abi_flag = bld.env['PYTHON_SO_ABI_FLAG']
- replacement = '.py%s' % bld.env['PYTHON_VERSION'].split('.')[0]
- version_libname = libname.replace(abi_flag, replacement)
+ # Remove the Python VERSION
abi_file_prefix = libname.replace(bld.env['PYTHON_VERSION'], '')
else:
- version_libname = libname
abi_file_prefix = None
vscript = None
@@ -280,7 +276,7 @@ def SAMBA_LIBRARY(bld, libname, source,
version = None
if version:
vscript = "%s.vscript" % libname
- bld.ABI_VSCRIPT(version_libname, abi_directory, version, vscript,
+ bld.ABI_VSCRIPT(libname, abi_directory, version, vscript,
abi_match, abi_file_prefix)
fullname = apply_pattern(bundled_name, bld.env.shlib_PATTERN)
fullpath = bld.path.find_or_declare(fullname)
@@ -306,7 +302,6 @@ def SAMBA_LIBRARY(bld, libname, source,
samba_deps = deps,
samba_includes = includes,
version_script = vscript,
- version_libname = version_libname,
local_include = local_include,
global_include = global_include,
vnum = vnum,
--
2.13.0
From 24c31d6f17c3d0b3bcc561f8b83d38ca278bc4ac Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Mon, 10 Jul 2017 14:04:15 +0200
Subject: [PATCH 6/7] talloc: Remove duplicate pytalloc-util ABI files
All versions of python will the same files for generation of
version script.
Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
lib/talloc/ABI/pytalloc-util.py3-2.1.5.sigs | 5 -----
lib/talloc/ABI/pytalloc-util.py3-2.1.6.sigs | 12 ------------
lib/talloc/ABI/pytalloc-util.py3-2.1.7.sigs | 12 ------------
lib/talloc/ABI/pytalloc-util.py3-2.1.8.sigs | 12 ------------
lib/talloc/ABI/pytalloc-util.py3-2.1.9.sigs | 15 ---------------
5 files changed, 56 deletions(-)
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.5.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.6.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.7.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.8.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.9.sigs
diff --git a/lib/talloc/ABI/pytalloc-util.py3-2.1.5.sigs b/lib/talloc/ABI/pytalloc-util.py3-2.1.5.sigs
deleted file mode 100644
index 0807eb329657f7540b5aaa652e0441dbac1a3abe..0000000000000000000000000000000000000000
--- a/lib/talloc/ABI/pytalloc-util.py3-2.1.5.sigs
+++ /dev/null
@@ -1,5 +0,0 @@
-pytalloc_Check: int (PyObject *)
-pytalloc_GetObjectType: PyTypeObject *(void)
-pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
-pytalloc_steal: PyObject *(PyTypeObject *, void *)
-pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
diff --git a/lib/talloc/ABI/pytalloc-util.py3-2.1.6.sigs b/lib/talloc/ABI/pytalloc-util.py3-2.1.6.sigs
deleted file mode 100644
index 4410f110cb299ef5eaaeac54d43c5712d6beeb98..0000000000000000000000000000000000000000
--- a/lib/talloc/ABI/pytalloc-util.py3-2.1.6.sigs
+++ /dev/null
@@ -1,12 +0,0 @@
-_pytalloc_get_mem_ctx: TALLOC_CTX *(PyObject *)
-_pytalloc_get_ptr: void *(PyObject *)
-_pytalloc_get_type: void *(PyObject *, const char *)
-pytalloc_BaseObject_PyType_Ready: int (PyTypeObject *)
-pytalloc_BaseObject_check: int (PyObject *)
-pytalloc_BaseObject_size: size_t (void)
-pytalloc_Check: int (PyObject *)
-pytalloc_GetBaseObjectType: PyTypeObject *(void)
-pytalloc_GetObjectType: PyTypeObject *(void)
-pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
-pytalloc_steal: PyObject *(PyTypeObject *, void *)
-pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
diff --git a/lib/talloc/ABI/pytalloc-util.py3-2.1.7.sigs b/lib/talloc/ABI/pytalloc-util.py3-2.1.7.sigs
deleted file mode 100644
index 4410f110cb299ef5eaaeac54d43c5712d6beeb98..0000000000000000000000000000000000000000
--- a/lib/talloc/ABI/pytalloc-util.py3-2.1.7.sigs
+++ /dev/null
@@ -1,12 +0,0 @@
-_pytalloc_get_mem_ctx: TALLOC_CTX *(PyObject *)
-_pytalloc_get_ptr: void *(PyObject *)
-_pytalloc_get_type: void *(PyObject *, const char *)
-pytalloc_BaseObject_PyType_Ready: int (PyTypeObject *)
-pytalloc_BaseObject_check: int (PyObject *)
-pytalloc_BaseObject_size: size_t (void)
-pytalloc_Check: int (PyObject *)
-pytalloc_GetBaseObjectType: PyTypeObject *(void)
-pytalloc_GetObjectType: PyTypeObject *(void)
-pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
-pytalloc_steal: PyObject *(PyTypeObject *, void *)
-pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
diff --git a/lib/talloc/ABI/pytalloc-util.py3-2.1.8.sigs b/lib/talloc/ABI/pytalloc-util.py3-2.1.8.sigs
deleted file mode 100644
index 4410f110cb299ef5eaaeac54d43c5712d6beeb98..0000000000000000000000000000000000000000
--- a/lib/talloc/ABI/pytalloc-util.py3-2.1.8.sigs
+++ /dev/null
@@ -1,12 +0,0 @@
-_pytalloc_get_mem_ctx: TALLOC_CTX *(PyObject *)
-_pytalloc_get_ptr: void *(PyObject *)
-_pytalloc_get_type: void *(PyObject *, const char *)
-pytalloc_BaseObject_PyType_Ready: int (PyTypeObject *)
-pytalloc_BaseObject_check: int (PyObject *)
-pytalloc_BaseObject_size: size_t (void)
-pytalloc_Check: int (PyObject *)
-pytalloc_GetBaseObjectType: PyTypeObject *(void)
-pytalloc_GetObjectType: PyTypeObject *(void)
-pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
-pytalloc_steal: PyObject *(PyTypeObject *, void *)
-pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
diff --git a/lib/talloc/ABI/pytalloc-util.py3-2.1.9.sigs b/lib/talloc/ABI/pytalloc-util.py3-2.1.9.sigs
deleted file mode 100644
index 62f066f7d5f5f8e4139c5a56926ed141500bbc0b..0000000000000000000000000000000000000000
--- a/lib/talloc/ABI/pytalloc-util.py3-2.1.9.sigs
+++ /dev/null
@@ -1,15 +0,0 @@
-_pytalloc_check_type: int (PyObject *, const char *)
-_pytalloc_get_mem_ctx: TALLOC_CTX *(PyObject *)
-_pytalloc_get_ptr: void *(PyObject *)
-_pytalloc_get_type: void *(PyObject *, const char *)
-pytalloc_BaseObject_PyType_Ready: int (PyTypeObject *)
-pytalloc_BaseObject_check: int (PyObject *)
-pytalloc_BaseObject_size: size_t (void)
-pytalloc_Check: int (PyObject *)
-pytalloc_GenericObject_reference_ex: PyObject *(TALLOC_CTX *, void *)
-pytalloc_GenericObject_steal_ex: PyObject *(TALLOC_CTX *, void *)
-pytalloc_GetBaseObjectType: PyTypeObject *(void)
-pytalloc_GetObjectType: PyTypeObject *(void)
-pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
-pytalloc_steal: PyObject *(PyTypeObject *, void *)
-pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
--
2.13.0
From 22c0abd6dbdce69698cd5eafccbb31d1148ad278 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Mon, 10 Jul 2017 14:07:33 +0200
Subject: [PATCH 7/7] ldb: Remove duplicate pyldb-util ABI files
All versions of python will the same files for generation of
version script.
Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
lib/ldb/ABI/pyldb-util.py3-1.1.23.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs | 2 --
lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs | 2 --
10 files changed, 20 deletions(-)
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.23.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.23.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.23.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.23.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs b/lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs
deleted file mode 100644
index 74d6719d2bc566cef73f4dd79e5f8b73f3193eaa..0000000000000000000000000000000000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
--
2.13.0
More information about the samba-technical
mailing list