diff --git a/srcpkgs/knot-resolver/patches/0001-Revert-Revert-meson-use-correct-luajit-includes-from.patch b/srcpkgs/knot-resolver/patches/0001-Revert-Revert-meson-use-correct-luajit-includes-from.patch new file mode 100644 index 00000000000..e5b1b14cbb4 --- /dev/null +++ b/srcpkgs/knot-resolver/patches/0001-Revert-Revert-meson-use-correct-luajit-includes-from.patch @@ -0,0 +1,89 @@ +From 67322b2b0081bdd0e1bc4e6df1011f9c6bd2a37a Mon Sep 17 00:00:00 2001 +From: Duncan Overbruck +Date: Fri, 15 Sep 2023 19:38:48 +0200 +Subject: [PATCH] Revert "Revert "meson: use correct luajit includes from + pkgconfig"" + +This reverts commit 2b6df073db13461edc8b3387ff17dafe1111b920. +--- + meson.build | 4 ++++ + modules/extended_error/meson.build | 1 + + modules/meson.build | 2 -- + modules/stats/meson.build | 1 + + utils/cache_gc/meson.build | 1 + + 5 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 1dfc160b..74c1ff5a 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,6 +29,9 @@ if not lmdb.found() # darwin workaround: missing pkgconfig + endif + gnutls = dependency('gnutls') + luajit = dependency('luajit') ++# NOTE avoid using link_args for luajit due to a macOS issue ++# https://github.com/Homebrew/homebrew-core/issues/37169 ++luajit_inc = luajit.partial_dependency(compile_args: true, includes: true) + message('------------------------------') + + +@@ -58,6 +61,7 @@ systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resol + systemd_unit_dir = prefix / 'lib' / 'systemd' / 'system' + systemd_tmpfiles_dir = prefix / 'lib' / 'tmpfiles.d' + systemd_sysusers_dir = prefix / 'lib' / 'sysusers.d' ++mod_inc_dir = include_directories('.', 'contrib/') + + ## Trust anchors + managed_ta = get_option('managed_ta') == 'enabled' +diff --git a/modules/extended_error/meson.build b/modules/extended_error/meson.build +index 15a1772f..98b05a88 100644 +--- a/modules/extended_error/meson.build ++++ b/modules/extended_error/meson.build +@@ -11,6 +11,7 @@ extended_error_mod = shared_module( + extended_error_src, + dependencies: [ + libknot, ++ luajit_inc, + ], + include_directories: mod_inc_dir, + name_prefix: '', +diff --git a/modules/meson.build b/modules/meson.build +index 38612254..c5360c8b 100644 +--- a/modules/meson.build ++++ b/modules/meson.build +@@ -32,8 +32,6 @@ integr_tests += [ + ['serve_stale', meson.current_source_dir() / 'serve_stale' / 'test.integr'], + ] + +-mod_inc_dir = include_directories('..', '../contrib', +- luajit.get_pkgconfig_variable('includedir')) + + # handle more complex C/LUA modules separately + subdir('bogus_log') +diff --git a/modules/stats/meson.build b/modules/stats/meson.build +index cb4ccd68..7a4ab07d 100644 +--- a/modules/stats/meson.build ++++ b/modules/stats/meson.build +@@ -16,6 +16,7 @@ stats_mod = shared_module( + stats_src, + dependencies: [ + libknot, ++ luajit_inc, + ], + include_directories: mod_inc_dir, + name_prefix: '', +diff --git a/utils/cache_gc/meson.build b/utils/cache_gc/meson.build +index 40e127d2..02ab6c63 100644 +--- a/utils/cache_gc/meson.build ++++ b/utils/cache_gc/meson.build +@@ -18,6 +18,7 @@ if build_utils + contrib_dep, + libkres_dep, + libknot, ++ luajit_inc, + ], + install: true, + install_dir: get_option('sbindir'), +-- +2.42.0 + diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template index 527c4216854..9bad210e379 100644 --- a/srcpkgs/knot-resolver/template +++ b/srcpkgs/knot-resolver/template @@ -1,7 +1,7 @@ # Template file for 'knot-resolver' pkgname=knot-resolver -version=5.6.0 -revision=2 +version=5.7.0 +revision=1 build_style=meson configure_args=" -Dclient=enabled @@ -20,7 +20,7 @@ license="GPL-3.0-or-later" homepage="https://www.knot-resolver.cz/" changelog="https://github.com/CZ-NIC/knot-resolver/raw/master/NEWS" distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz" -checksum=0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7 +checksum=383ef6db1cccabd2dd788ea9385f05e98a2bafdfeb7f0eda57ff9d572f4fad71 system_accounts="_knot_resolver" _knot_resolver_homedir="/var/cache/knot-resolver"