From 47ce75da3d24e273f625ab8c794940af72cc18f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 3 Apr 2026 12:26:26 +0200 Subject: [PATCH] knot-resolver: drop LMDB build workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop the meson.build workaround needed before commit 8aa78ebebfb6727c46334a69e32fc76576376a09, which fixed the underlying issue. Link: https://github.com/openwrt/packages/pull/29047 Signed-off-by: Michał Kępień --- net/knot-resolver/Makefile | 2 +- net/knot-resolver/patches/010-fix-lmdb.patch | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 net/knot-resolver/patches/010-fix-lmdb.patch diff --git a/net/knot-resolver/Makefile b/net/knot-resolver/Makefile index 39c3b24e9d..098e5b3013 100644 --- a/net/knot-resolver/Makefile +++ b/net/knot-resolver/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knot-resolver PKG_VERSION:=5.7.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-resolver diff --git a/net/knot-resolver/patches/010-fix-lmdb.patch b/net/knot-resolver/patches/010-fix-lmdb.patch deleted file mode 100644 index 2b0f0c030a..0000000000 --- a/net/knot-resolver/patches/010-fix-lmdb.patch +++ /dev/null @@ -1,20 +0,0 @@ -This is just workaround. It should be removed after proper fixing in upstream. -Patch fixes problem with lmdb pkg confing. It also adds workaround for get_option -which is now not propagated in OpenWrt meson host package. ---- a/meson.build -+++ b/meson.build -@@ -23,10 +23,10 @@ libknot = dependency('libknot', version: - libdnssec = dependency('libdnssec', version: knot_version) - libzscanner = dependency('libzscanner', version: knot_version) - libuv = dependency('libuv', version: '>=1.7') --lmdb = dependency('lmdb', required: false) --if not lmdb.found() # darwin workaround: missing pkgconfig -- lmdb = meson.get_compiler('c').find_library('lmdb') --endif -+##lmdb = dependency('lmdb', required: false) -+##if not lmdb.found() # darwin workaround: missing pkgconfig -+lmdb = meson.get_compiler('c').find_library('lmdb') -+##endif - gnutls = dependency('gnutls') - luajit = dependency('luajit') - message('------------------------------')