diff options
| author | Tomas Krizek | 2019-05-27 11:59:28 +0200 |
|---|---|---|
| committer | Tomas Krizek | 2019-05-27 11:59:48 +0200 |
| commit | 8acca386338b0196b56ce156c60b60c9b00d4ee9 (patch) | |
| tree | f71edeb8f8a92cb66cff42f14816bf4df355c530 | |
| parent | 705aa7f05ca5aa28d8d637ce43181ecf4fdc6d7f (diff) | |
| download | aur-8acca386338b0196b56ce156c60b60c9b00d4ee9.tar.gz | |
fix dnstap build (upstream #461)
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 01-meson-dnstap.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
3 files changed, 35 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = knot-resolver pkgdesc = full caching DNS resolver implementation pkgver = 4.0.0 - pkgrel = 1 + pkgrel = 2 url = https://www.knot-resolver.cz/ install = install arch = x86_64 @@ -27,7 +27,9 @@ pkgbase = knot-resolver options = strip backup = etc/knot-resolver/kresd.conf source = https://secure.nic.cz/files/knot-resolver/knot-resolver-4.0.0.tar.xz + source = 01-meson-dnstap.patch sha256sums = 37161d931e64535ce38c33b9635f06a43cd1541945bf2c79a55e37f230de1631 + sha256sums = f99f98a19eff4020fe899479e41e7e8da1495fa203da9a96296c8732820caf23 pkgname = knot-resolver diff --git a/01-meson-dnstap.patch b/01-meson-dnstap.patch new file mode 100644 index 000000000000..ce63958d3c69 --- /dev/null +++ b/01-meson-dnstap.patch @@ -0,0 +1,22 @@ +commit 3843ec4c50c5a97b74500e9e7277c49848b91e81 +Author: Tomas Krizek <tomas.krizek@nic.cz> +Date: 2019-04-23 11:52:42 +0200 + + meson: dnstap - use declare_dependency for generated sources + + Closes #461 + +diff --git a/modules/dnstap/meson.build b/modules/dnstap/meson.build +index c3aa0803..3a4813fb 100644 +--- a/modules/dnstap/meson.build ++++ b/modules/dnstap/meson.build +@@ -40,8 +40,8 @@ if build_dnstap + dnstap_mod = shared_module( + 'dnstap', + dnstap_src, +- dnstap_pb[1], + dependencies: [ ++ declare_dependency(sources: dnstap_pb), + libfstrm, + libprotobuf_c, + ], @@ -3,7 +3,7 @@ pkgname=knot-resolver pkgver=4.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='full caching DNS resolver implementation' url='https://www.knot-resolver.cz/' arch=('x86_64' 'armv7h') @@ -34,9 +34,16 @@ makedepends=( 'systemd-libs' ) -source=("https://secure.nic.cz/files/${pkgname}/${pkgname}-${pkgver}.tar.xz") +source=("https://secure.nic.cz/files/${pkgname}/${pkgname}-${pkgver}.tar.xz" + '01-meson-dnstap.patch') -sha256sums=('37161d931e64535ce38c33b9635f06a43cd1541945bf2c79a55e37f230de1631') +sha256sums=('37161d931e64535ce38c33b9635f06a43cd1541945bf2c79a55e37f230de1631' + 'f99f98a19eff4020fe899479e41e7e8da1495fa203da9a96296c8732820caf23') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/01-meson-dnstap.patch" +} build() { cd "${srcdir}/${pkgname}-${pkgver}" |