aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/talloc/APKBUILD27
-rw-r--r--main/talloc/always-libs.patch2
2 files changed, 9 insertions, 20 deletions
diff --git a/main/talloc/APKBUILD b/main/talloc/APKBUILD
index cdb15cee1f..43310489a5 100644
--- a/main/talloc/APKBUILD
+++ b/main/talloc/APKBUILD
@@ -1,15 +1,15 @@
# Contributor:
# Maintainer:
pkgname=talloc
-pkgver=2.1.14
-pkgrel=2
+pkgver=2.2.0
+pkgrel=0
pkgdesc="Memory pool management library"
url="https://talloc.samba.org"
arch="all"
license="LGPL-3.0-or-later"
replaces="samba-common"
-makedepends="docbook-xsl libxslt python2-dev python3-dev"
-subpackages="$pkgname-dev py2-$pkgname:_py2 py3-$pkgname:_py3 $pkgname-doc"
+makedepends="docbook-xsl libxslt python3-dev"
+subpackages="$pkgname-dev py3-$pkgname:_py3 $pkgname-doc"
source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz
always-libs.patch
"
@@ -29,12 +29,11 @@ build() {
--builtin-libraries=replace \
--disable-rpath \
--disable-rpath-install \
- --without-gettext \
- --extra-python=/usr/bin/python3
+ --without-gettext
make
# talloc's Waf setup doesn't build static libraries, so we do it manually
- ar qf libtalloc.a bin/default/talloc_*.o
+ ar qf libtalloc.a bin/default/talloc.c*.o
}
check() {
@@ -48,16 +47,6 @@ package() {
install -Dm644 libtalloc.a "$pkgdir"/usr/lib/libtalloc.a
}
-_py2() {
- pkgdesc="Python 2 binding for libtalloc"
- replaces="py-talloc" # for backward compatibility
- provides="py-talloc=$pkgver-r$pkgrel" # for backward compatibility
-
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libpytalloc-util.so.* \
- "$pkgdir"/usr/lib/python2* "$subpkgdir"/usr/lib/
-}
-
_py3() {
pkgdesc="Python 3 binding for libtalloc"
@@ -66,5 +55,5 @@ _py3() {
"$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
}
-sha512sums="1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130 talloc-2.1.14.tar.gz
-fa818d6291f6291d193b475af993de4fd34e6133ccacb55203f5c96973c51b2e932523f5f2a8cd38a4959e80d8378841b3b5efd5411b7828a240102b492c16e7 always-libs.patch"
+sha512sums="e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388 talloc-2.2.0.tar.gz
+66d06f735fe591f3a888ced25c4c5a0068402001736ce52443d0670d42bf7144c7f69ff9c6299ecf4d9001f23c68403953c4bdc7325f4d094d304e4215ff90b1 always-libs.patch"
diff --git a/main/talloc/always-libs.patch b/main/talloc/always-libs.patch
index f1e60fcb29..d6b9020d5d 100644
--- a/main/talloc/always-libs.patch
+++ b/main/talloc/always-libs.patch
@@ -4,7 +4,7 @@
msg = "rpath library support"
else:
msg = "building library support"
-+ return True
++ return True
dir = find_config_dir(conf)