Update to tdb-1.3.7, needed for the upcoming samba release.
ok sthen@
This commit is contained in:
jca
parent
cbf1390cba
commit
dfecf4a5ca
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2016/04/05 16:34:36 jca Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2016/04/12 17:38:15 jca Exp $
|
||||
|
||||
COMMENT= trivial database library
|
||||
|
||||
# Keep in sync with the version bundled in net/samba4
|
||||
DISTNAME= tdb-1.2.12
|
||||
REVISION= 2
|
||||
DISTNAME= tdb-1.3.7
|
||||
|
||||
SHARED_LIBS+= tdb 4.0
|
||||
SHARED_LIBS+= tdb 4.1
|
||||
|
||||
CATEGORIES= databases
|
||||
|
||||
@ -37,6 +36,7 @@ MAKE_ENV += LIB${_l:S/-/_/g}_VERSION=${_v}
|
||||
.endfor
|
||||
|
||||
CONFIGURE_STYLE= simple
|
||||
CONFIGURE_ARGS= --mandir="${PREFIX}/man"
|
||||
CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
|
||||
--disable-rpath
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (tdb-1.2.12.tar.gz) = KC09scxWrDARrl85Iv0MW7IX7LAyCDbCO2/mfyFjpx8=
|
||||
SIZE (tdb-1.2.12.tar.gz) = 462590
|
||||
SHA256 (tdb-1.3.7.tar.gz) = pk2VygzAaij+0kxulSrtdmDK4EmDEIc11rwwuSUTZBI=
|
||||
SIZE (tdb-1.3.7.tar.gz) = 493847
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-buildtools_wafadmin_Tools_ccroot_py,v 1.1 2015/07/18 02:11:13 jca Exp $
|
||||
|
||||
- at build time, encode the full library name + version in the SONAME
|
||||
|
||||
--- buildtools/wafadmin/Tools/ccroot.py.orig Sun Jan 27 04:51:43 2013
|
||||
+++ buildtools/wafadmin/Tools/ccroot.py Thu Jul 16 12:55:30 2015
|
||||
@@ -588,7 +588,10 @@ def apply_vnum(self):
|
||||
name2 = libname + '.' + nums[0]
|
||||
|
||||
if self.env.SONAME_ST:
|
||||
- v = self.env.SONAME_ST % name2
|
||||
+ if sys.platform.startswith('openbsd'):
|
||||
+ v = self.env.SONAME_ST % name3
|
||||
+ else:
|
||||
+ v = self.env.SONAME_ST % name2
|
||||
self.env.append_value('LINKFLAGS', v.split())
|
||||
|
||||
bld = self.bld
|
||||
@ -1,25 +1,32 @@
|
||||
$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.1 2015/07/18 02:11:13 jca Exp $
|
||||
$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.2 2016/04/12 17:38:15 jca Exp $
|
||||
|
||||
- install_link is used so encode the SONAME; use of SONAME is currenty
|
||||
needed since the installed library is created with an improper name
|
||||
(eg "libsomething.inst.so")
|
||||
- respect OpenBSD shared libraries versioning
|
||||
- --version-script fails if specified multipled times
|
||||
|
||||
- no need to setup symlinks on OpenBSD
|
||||
--- buildtools/wafsamba/samba_install.py.orig Sat Jun 13 03:00:10 2015
|
||||
+++ buildtools/wafsamba/samba_install.py Sun Apr 10 12:24:17 2016
|
||||
@@ -117,9 +117,12 @@ def install_library(self):
|
||||
elif self.vnum:
|
||||
vnum_base = self.vnum.split('.')[0]
|
||||
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 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'):
|
||||
# only generate the dev link for non-bundled libs
|
||||
dev_link = bld.make_libname(target_name)
|
||||
elif getattr(self, 'soname', ''):
|
||||
@@ -169,7 +172,7 @@ def apply_vscript(self):
|
||||
'''add version-script arguments to library build'''
|
||||
|
||||
if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''):
|
||||
- self.env.append_value('LINKFLAGS', "-Wl,--version-script=%s" %
|
||||
+ self.env.append_unique('LINKFLAGS', "-Wl,--version-script=%s" %
|
||||
self.version_script)
|
||||
self.version_script = None
|
||||
|
||||
--- buildtools/wafsamba/samba_install.py.orig Sun Jan 27 04:51:43 2013
|
||||
+++ buildtools/wafsamba/samba_install.py Thu Jul 16 13:57:59 2015
|
||||
@@ -112,9 +112,12 @@ def install_library(self):
|
||||
elif self.vnum:
|
||||
vnum_base = self.vnum.split('.')[0]
|
||||
install_name = bld.make_libname(target_name, version=self.vnum)
|
||||
- install_link = bld.make_libname(target_name, version=vnum_base)
|
||||
+ if sys.platform.startswith('openbsd'):
|
||||
+ install_link = install_name
|
||||
+ else:
|
||||
+ 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 and not sys.platform.startswith('openbsd'):
|
||||
# only generate the dev link for non-bundled libs
|
||||
dev_link = bld.make_libname(target_name)
|
||||
elif getattr(self, 'soname', ''):
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.2 2016/04/05 16:34:36 jca Exp $
|
||||
$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.3 2016/04/12 17:38:15 jca Exp $
|
||||
|
||||
- allow the library version to be overriden
|
||||
- make sure we don't clobber the version that ends up in tdb.pc
|
||||
|
||||
--- buildtools/wafsamba/wafsamba.py.orig Tue Jun 4 16:21:30 2013
|
||||
+++ buildtools/wafsamba/wafsamba.py Tue Apr 5 02:09:58 2016
|
||||
@@ -195,6 +195,13 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
--- buildtools/wafsamba/wafsamba.py.orig Tue Jul 21 22:32:32 2015
|
||||
+++ buildtools/wafsamba/wafsamba.py Sun Apr 10 12:53:36 2016
|
||||
@@ -215,6 +215,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'))
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.2 2016/04/05 16:34:36 jca Ex
|
||||
# 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:
|
||||
@@ -283,7 +290,7 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
@@ -313,7 +320,7 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
t.link_name = link_name
|
||||
|
||||
if pc_files is not None and not private_library:
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-lib_replace_replace_h,v 1.1 2015/07/18 02:11:13 jca Exp $
|
||||
|
||||
- kill noisy warnings, malloc.h is deprecated
|
||||
|
||||
--- lib/replace/replace.h.orig Thu Jul 16 12:58:28 2015
|
||||
+++ lib/replace/replace.h Thu Jul 16 12:58:50 2015
|
||||
@@ -56,10 +56,6 @@
|
||||
#undef HAVE_INTTYPES_H
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_MALLOC_H
|
||||
-#include <malloc.h>
|
||||
-#endif
|
||||
-
|
||||
#ifndef __PRI64_PREFIX
|
||||
# if __WORDSIZE == 64 && ! defined __APPLE__
|
||||
# define __PRI64_PREFIX "l"
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.7 2015/07/18 02:22:33 jca Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.8 2016/04/12 17:38:15 jca Exp $
|
||||
@conflict samba-<3.5.0
|
||||
@bin bin/tdbbackup
|
||||
@bin bin/tdbdump
|
||||
@ -7,6 +7,7 @@
|
||||
include/tdb.h
|
||||
@lib lib/libtdb.so.${LIBtdb_VERSION}
|
||||
lib/pkgconfig/tdb.pc
|
||||
lib/python${MODPY_VERSION}/site-packages/_tdb_text.py
|
||||
lib/python${MODPY_VERSION}/site-packages/tdb.so
|
||||
@man man/man8/tdbbackup.8
|
||||
@man man/man8/tdbdump.8
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user