From 95d2373a329754f69c1b50fe1ed2231fc0beef3e Mon Sep 17 00:00:00 2001 From: tcely <tcely@users.noreply.github.com> Date: Wed, 17 Apr 2019 06:23:48 -0400 Subject: [PATCH] main/unbound: improve build - add -openrc subpackage - cleanup depends for subpackages - switch to python3 --- main/unbound/APKBUILD | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD index 304e92faea8f..d914cc47e22b 100644 --- a/main/unbound/APKBUILD +++ b/main/unbound/APKBUILD @@ -10,7 +10,8 @@ arch="all" license="BSD-3-Clause" depends="dns-root-hints dnssec-root" depends_dev="expat-dev" -makedepends="$depends_dev libevent-dev openssl-dev python2-dev swig linux-headers" +depends_migrate="/bin/sh apk-tools dns-root-hints openrc" +makedepends="$depends_dev libevent-dev openssl-dev python3-dev swig linux-headers" install="$pkgname.pre-install" options="!check" pkgusers="unbound" @@ -28,7 +29,7 @@ builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - ./configure \ + PYTHON_VERSION=3 ./configure \ --build="$CBUILD" \ --host="$CHOST" \ --prefix=/usr \ @@ -77,13 +78,21 @@ package() { libs() { pkgdesc="unbound shared libraries" + depends="$depends_libs" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ } +openrc() { + depends="$depends_openrc" + + default_openrc +} + py() { pkgdesc="Python bindings to libunbound" + depends="$depends_py" mkdir -p "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ @@ -91,6 +100,7 @@ py() { migrate() { pkgdesc="Simple tool to migrate from dnscache to unbound" + depends="$depends_migrate" install -m755 -D "$srcdir"/migrate-dnscache-to-unbound \ "$subpkgdir"/usr/bin/migrate-dnscache-to-unbound -- GitLab