mirror of
https://github.com/openwrt/packages.git
synced 2026-04-15 10:51:55 +00:00
knot-resolver: drop LMDB build workaround
Drop the meson.build workaround needed before commit
8aa78ebebf, which fixed the
underlying issue.
Link: https://github.com/openwrt/packages/pull/29047
Signed-off-by: Michał Kępień <michal@isc.org>
This commit is contained in:
committed by
Alexandru Ardelean
parent
8aa78ebebf
commit
47ce75da3d
@@ -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
|
||||
|
||||
@@ -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('------------------------------')
|
||||
Reference in New Issue
Block a user