From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Mon, 7 Oct 2024 12:50:47 +0000 (+0200)
Subject: distro/pkg/deb: use meson through debhelper
X-Git-Tag: v6.0.9~6^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=399412ff0b9c883ee61e46c8ad2261c801149a47;p=thirdparty%2Fknot-resolver.git

distro/pkg/deb: use meson through debhelper

Use standard debhelper as opposed to calling meson and ninja manually.
---

diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 66c71c3ee..0fbd35709 100755
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -19,10 +19,10 @@ include /usr/share/dpkg/default.mk
 
 
 %:
-	dh $@ --with python3 --buildsystem pybuild
+	dh $@ --with python3 --buildsystem=meson
 
-override_dh_auto_build:
-	meson build_deb \
+override_dh_auto_configure:
+	dh_auto_configure -- \
 		--buildtype=plain \
 		--prefix=/usr \
 		--libdir=lib \
@@ -31,16 +31,15 @@ override_dh_auto_build:
 		-Dkeyfile_default=/usr/share/dns/root.key \
 		-Droot_hints=/usr/share/dns/root.hints \
 		-Dunit_tests=enabled \
-		-Dmalloc=jemalloc \
-		-Dc_args="$${CFLAGS}" \
-		-Dc_link_args="$${LDFLAGS}"
-	ninja -v -C build_deb
-	PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" dh_auto_build
+		-Dmalloc=jemalloc
+
+override_dh_auto_build:
+	dh_auto_build
+	PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
+		dh_auto_build --buildsystem=pybuild
 
 override_dh_auto_install:
-	DESTDIR="$(shell pwd)/debian/tmp" ninja -v -C build_deb install
-	PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" dh_auto_install
+	dh_auto_install
+	PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
+		dh_auto_install --buildsystem=pybuild
 	install -m 644 -D etc/config/config.yaml debian/tmp/etc/knot-resolver/config.yaml
-
-override_dh_auto_test:
-	meson test -C build_deb