commit: 0b7f5dcc24d3831c651feaa960139cf45ba91808 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Fri Mar 6 13:22:34 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 11 13:48:50 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7f5dcc
net-dns/knot-resolver: fix cross-compiling protoc with --c_out requires protoc-gen-c from protobuf-c avoid pkg-config --variables=includedir which doesn't pass $EROOT Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://codeberg.org/gentoo/gentoo/pulls/252 Merges: https://codeberg.org/gentoo/gentoo/pulls/252 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/knot-resolver-6.2.0-fix_luajit_include.patch | 15 +++++++++++++++ net-dns/knot-resolver/knot-resolver-6.2.0.ebuild | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net-dns/knot-resolver/files/knot-resolver-6.2.0-fix_luajit_include.patch b/net-dns/knot-resolver/files/knot-resolver-6.2.0-fix_luajit_include.patch new file mode 100644 index 000000000000..993a9e88fd54 --- /dev/null +++ b/net-dns/knot-resolver/files/knot-resolver-6.2.0-fix_luajit_include.patch @@ -0,0 +1,15 @@ +See PR pending https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1816.patch +pkg-config --variable=includedir doesn't pass $EROOT. +luajit already in mod_deps is sufficient. +--- a/modules/meson.build ++++ b/modules/meson.build +@@ -34,8 +34,7 @@ integr_tests += [ + ['serve_stale', meson.current_source_dir() / 'serve_stale' / 'test.integr'], + ] + +-mod_inc_dir = include_directories('..', '../contrib', +- luajit.get_variable(pkgconfig: 'includedir')) ++mod_inc_dir = include_directories('..', '../contrib') + + mod_deps = [ + contrib_dep, diff --git a/net-dns/knot-resolver/knot-resolver-6.2.0.ebuild b/net-dns/knot-resolver/knot-resolver-6.2.0.ebuild index 99ef9c380270..8ece7a69a462 100644 --- a/net-dns/knot-resolver/knot-resolver-6.2.0.ebuild +++ b/net-dns/knot-resolver/knot-resolver-6.2.0.ebuild @@ -72,7 +72,10 @@ DEPEND=" " BDEPEND=" virtual/pkgconfig - dnstap? ( dev-libs/protobuf[protoc(+)] ) + dnstap? ( + dev-libs/protobuf[protoc(+)] + dev-libs/protobuf-c + ) manager? ( ${DISTUTILS_DEPS} ${PYTHON_DEPS} @@ -88,6 +91,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.9-config-example.patch "${FILESDIR}"/${PN}-6.0.12-pytest_tomllib.patch "${FILESDIR}"/${PN}-6.1.0-libsystemd.patch + "${FILESDIR}"/${PN}-6.2.0-fix_luajit_include.patch ) pkg_setup() {
