Commit 5f1ebcb2 authored by Stefan Reiff's avatar Stefan Reiff Committed by Natanael Copa

main/ldb: upgrade to 1.5.4 and remove python2

parent a66c5986
From c161c5d4a3184c0ae9a33d977f061458337d4ca1 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@fedoraproject.org>
Date: Wed, 30 May 2018 23:22:40 +0200
Subject: [PATCH] ldb: Run at least some tests on 32 bit machines
lmdb is supported only on 64 bit machines. But there also
unit tests which pass just with tdb on 32 bit architectures.
Signed-off-by: Lukas Slebodnik <lslebodn@fedoraproject.org>
---
wscript | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/wscript b/wscript
index ca0bf410f1029f33bab9b71514935011d57b1dbc..851344733645f51186d0b568f2741ac888a52660 100644
--- a/wscript
+++ b/wscript
@@ -540,10 +540,6 @@ def test(ctx):
env = samba_utils.LOAD_ENVIRONMENT()
ctx.env = env
- if not env.HAVE_LMDB:
- raise Errors.WafError('make test called, but ldb was built '
- '--without-ldb-lmdb')
-
test_prefix = "%s/st" % (Context.g_module.out)
shutil.rmtree(test_prefix, ignore_errors=True)
os.makedirs(test_prefix)
@@ -559,9 +555,13 @@ def test(ctx):
tmp_dir = os.path.join(test_prefix, 'tmp')
if not os.path.exists(tmp_dir):
os.mkdir(tmp_dir)
- pyret = samba_utils.RUN_PYTHON_TESTS(
- ['tests/python/api.py', 'tests/python/index.py'],
- extra_env={'SELFTEST_PREFIX': test_prefix})
+
+ if env.HAVE_LMDB:
+ pyret = samba_utils.RUN_PYTHON_TESTS(
+ ['tests/python/api.py', 'tests/python/index.py'],
+ extra_env={'SELFTEST_PREFIX': test_prefix})
+ else:
+ pyret = 0
print("Python testsuite returned %d" % pyret)
cmocka_ret = 0
@@ -572,7 +572,10 @@ def test(ctx):
'ldb_tdb_guid_mod_op_test',
'ldb_msg_test',
'ldb_tdb_kv_ops_test',
- 'ldb_tdb_test',
+ 'ldb_tdb_test']
+
+ if env.HAVE_LMDB:
+ test_exes += [
'ldb_mdb_mod_op_test',
'ldb_lmdb_test',
# we don't want to run ldb_lmdb_size_test (which proves we can
--
2.20.1
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ldb
pkgver=1.3.8
pkgrel=1
pkgver=1.5.4
pkgrel=0
pkgdesc="A schema-less, ldap like, API and database"
url="https://ldb.samba.org/"
arch="all"
license="LGPL-3.0-or-later"
makedepends="libtirpc-dev tevent-dev py2-tevent tdb-dev py2-tdb talloc-dev
python2-dev python3-dev popt-dev cmocka-dev"
subpackages="$pkgname-dev py2-$pkgname:_py2 py3-$pkgname:_py3 $pkgname-tools"
makedepends="libtirpc-dev tevent-dev py3-tevent tdb-dev py3-tdb talloc-dev
python3-dev popt-dev cmocka-dev docbook-xsl lmdb-dev"
subpackages="$pkgname-dev py3-$pkgname:_py3 $pkgname-tools $pkgname-doc"
source="https://www.samba.org/ftp/pub/ldb/$pkgname-$pkgver.tar.gz
disable-compile-error-test.patch"
disable-compile-error-test.patch
0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
......@@ -27,8 +28,7 @@ build() {
--disable-rpath-install \
--builtin-libraries=replace \
--bundled-libraries=NONE \
--with-modulesdir=/usr/lib/ldb/modules \
--extra-python=/usr/bin/python3
--with-modulesdir=/usr/lib/ldb/modules
"$_waf" build
}
......@@ -42,16 +42,6 @@ package() {
DESTDIR="$pkgdir" "$_waf" install
}
_py2() {
pkgdesc="Python 2 binding for the ldb library"
provides="py-ldb=$pkgver-r$pkgrel" # for backward compatibility
replaces="py-ldb" # for backward compatibility
mkdir -p "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/python2* "$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/lib/libpyldb-util.so.* "$subpkgdir"/usr/lib/
}
_py3() {
pkgdesc="Python 3 binding for the ldb library"
......@@ -67,5 +57,6 @@ tools() {
mv "$pkgdir"/usr/lib/ldb/libldb-cmdline.* "$subpkgdir"/usr/lib/ldb/
}
sha512sums="06d1b4c2badbf0c27733a64f979c48af8b599747cef7cd7f5417cd55a76447e8f8987bd061694c5af63261fdb35433e3844122c14103d5cc8b4eaab1f4752541 ldb-1.3.8.tar.gz
ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8 disable-compile-error-test.patch"
sha512sums="fc323e4283671c14d6dd4feb7e9ca943a63a166688077dbf3591f9d957cf821f9e739869842e15ca1ec4fd3764123d5afc6f4954b1af437bd1ec54df58366a22 ldb-1.5.4.tar.gz
ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8 disable-compile-error-test.patch
619db1e1cbf991546b92cfa4fd2100a0b74f563d366981b552a9997152a98ee2c5e9029c77015ab57860d0ca48a98aa24b6e5bc1c330880cd85f39c1df811e55 0002-ldb-Run-at-least-some-tests-on-32-bit-machines.patch"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment