Update to tdb-1.4.3
Needed by newer samba releases, switches to python3. The SHARED_LIBS handling is a bit ugly because of the .cpython-XY tag added to some libraries names. Input from sthen@ and Ian McWilliam
This commit is contained in:
jca
parent
fbda2890a1
commit
3292ba788b
@ -1,15 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.35 2021/03/12 00:41:36 jca Exp $
|
||||
# $OpenBSD: Makefile,v 1.36 2021/05/12 23:30:53 jca Exp $
|
||||
|
||||
COMMENT-main= trivial database library
|
||||
COMMENT-python= Python ${MODPY_VERSION} bindings for tdb
|
||||
|
||||
# Keep in sync with the version bundled in net/samba
|
||||
V= 1.3.18
|
||||
REVISION= 0
|
||||
V= 1.4.3
|
||||
|
||||
DISTNAME= tdb-$V
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
PKGNAME-python= py-${DISTNAME}
|
||||
PKGNAME-python= py3-${DISTNAME}
|
||||
|
||||
MULTI_PACKAGES= -main -python
|
||||
|
||||
@ -28,14 +27,15 @@ MAINTAINER= Jeremie Courreges-Anglas <jca@wxcvbn.org>
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB-main= c pthread
|
||||
WANTLIB-python= intl m pthread tdb util ${MODPY_WANTLIB}
|
||||
WANTLIB-python= intl m pthread tdb util
|
||||
# Extra
|
||||
WANTLIB-python+=${MODPY_WANTLIB}
|
||||
|
||||
MASTER_SITES= https://download.samba.org/pub/tdb/
|
||||
|
||||
DEBUG_PACKAGES= ${BUILD_PACKAGES}
|
||||
|
||||
MODULES= lang/python
|
||||
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
|
||||
MODPY_RUNDEP= No
|
||||
MODPY_ADJ_FILES= buildtools/bin/waf
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (tdb-1.3.18.tar.gz) = wVa0Doi8gqU4iTQ3zXY9JvvtU3mHHg9yGf0CHmDTNrc=
|
||||
SIZE (tdb-1.3.18.tar.gz) = 697970
|
||||
SHA256 (tdb-1.4.3.tar.gz) = yAWDk9+hX0fhHr0vHRMmk/Czs7i/ItAgG/swUCb4ihs=
|
||||
SIZE (tdb-1.4.3.tar.gz) = 702836
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.5 2019/12/04 00:14:45 jca Exp $
|
||||
$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.6 2021/05/12 23:30:53 jca Exp $
|
||||
|
||||
- respect OpenBSD shared libraries versioning
|
||||
- --version-script fails if specified multipled times
|
||||
@ -6,7 +6,7 @@ $OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.5 2019/12/04 00:14:45 j
|
||||
Index: buildtools/wafsamba/samba_install.py
|
||||
--- buildtools/wafsamba/samba_install.py.orig
|
||||
+++ buildtools/wafsamba/samba_install.py
|
||||
@@ -117,11 +117,15 @@ def install_library(self):
|
||||
@@ -114,11 +114,15 @@ def install_library(self):
|
||||
else:
|
||||
inst_name = bld.make_libname(t.target)
|
||||
elif self.vnum:
|
||||
@ -15,17 +15,17 @@ Index: buildtools/wafsamba/samba_install.py
|
||||
install_name = bld.make_libname(target_name, version=self.vnum)
|
||||
- install_link = bld.make_libname(target_name, version=vnum_base)
|
||||
- inst_name = bld.make_libname(t.target)
|
||||
- if not self.private_library:
|
||||
- if not self.private_library or not t.env.SONAME_ST:
|
||||
+ if sys.platform.startswith('openbsd'):
|
||||
+ install_link = install_name
|
||||
+ else:
|
||||
+ install_link = bld.make_libname(target_name, version=self.vnum)
|
||||
+ inst_name = bld.make_libname(t.target, version=self.vnum)
|
||||
+ if not self.private_library and not sys.platform.startswith('openbsd'):
|
||||
+ if not sys.platform.startswith("openbsd") and (not self.private_library or not t.env.SONAME_ST):
|
||||
# only generate the dev link for non-bundled libs
|
||||
dev_link = bld.make_libname(target_name)
|
||||
elif getattr(self, 'soname', ''):
|
||||
@@ -172,7 +176,7 @@ def apply_vscript(self):
|
||||
@@ -169,7 +173,7 @@ def apply_vscript(self):
|
||||
'''add version-script arguments to library build'''
|
||||
|
||||
if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''):
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.8 2019/12/04 00:14:45 jca Exp $
|
||||
$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.9 2021/05/12 23:30:53 jca Exp $
|
||||
|
||||
- allow the library version to be overriden
|
||||
- make sure we don't clobber the version that ends up in tdb.pc
|
||||
@ -6,7 +6,7 @@ $OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.8 2019/12/04 00:14:45 jca Ex
|
||||
Index: buildtools/wafsamba/wafsamba.py
|
||||
--- buildtools/wafsamba/wafsamba.py.orig
|
||||
+++ buildtools/wafsamba/wafsamba.py
|
||||
@@ -214,6 +214,13 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
@@ -211,6 +211,13 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
|
||||
link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
|
||||
|
||||
@ -14,13 +14,13 @@ Index: buildtools/wafsamba/wafsamba.py
|
||||
+ if vnum is not None:
|
||||
+ osvnum = os.getenv('LIB' + libname.replace('-', '_') + '_VERSION')
|
||||
+ if osvnum:
|
||||
+ print "Setup-specific version for library %s: %s" % (libname, osvnum)
|
||||
+ print("Setup-specific version for library %s: %s" % (libname, osvnum))
|
||||
+ vnum = osvnum
|
||||
+
|
||||
# we don't want any public libraries without version numbers
|
||||
if (not private_library and target_type != 'PYTHON' and not realname):
|
||||
if vnum is None and soname is None:
|
||||
@@ -325,9 +332,9 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
@@ -322,9 +329,9 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
|
||||
if pc_files is not None and not private_library:
|
||||
if pyembed:
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-python,v 1.1 2021/01/23 23:17:47 kn Exp $
|
||||
@comment $OpenBSD: PLIST-python,v 1.2 2021/05/12 23:30:54 jca Exp $
|
||||
@conflict tdb-<1.3.18p0
|
||||
lib/python${MODPY_VERSION}/
|
||||
lib/python${MODPY_VERSION}/site-packages/
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}_tdb_text.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/_tdb_text.py
|
||||
lib/python${MODPY_VERSION}/site-packages/_tdb_text.pyc
|
||||
@so lib/python${MODPY_VERSION}/site-packages/tdb.so
|
||||
@so lib/python${MODPY_VERSION}/site-packages/tdb.${MODPY_PYC_MAGIC_TAG}so
|
||||
|
||||
Loading…
Reference in New Issue
Block a user