From 2eb8863903365cdcf57ec4b249fe2da74d82f7aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jakub=20Ru=C5=BEi=C4=8Dka?= Date: Thu, 22 May 2025 14:35:18 +0200 Subject: [PATCH] distro/pkg/deb: use meson through debhelper Use standard debhelper as opposed to calling meson and ninja manually. This mirrors v6 change and it fixes FTBFS on Ubuntu 25.04 in LaunchPad. --- distro/pkg/deb/rules | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules index c57747609..15a31ae3a 100755 --- a/distro/pkg/deb/rules +++ b/distro/pkg/deb/rules @@ -14,13 +14,12 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk -export ARCH=$(DEB_HOST_GNU_CPU) %: - dh $@ + dh $@ --buildsystem=meson -override_dh_auto_build: - meson build_deb \ +override_dh_auto_configure: + dh_auto_configure -- \ --buildtype=plain \ --prefix=/usr \ --libdir=lib \ @@ -33,19 +32,7 @@ override_dh_auto_build: -Dinstall_kresd_conf=enabled \ -Dunit_tests=enabled \ -Dmalloc=jemalloc \ - -Dc_args="$${CFLAGS}" \ - -Dc_link_args="$${LDFLAGS}" - ninja -v -C build_deb - ninja -v -C build_deb doc - -override_dh_auto_install: - DESTDIR="${PWD}/debian/tmp" ninja -v -C build_deb install - -override_dh_auto_test: - meson test -C build_deb -override_dh_missing: - dh_missing --fail-missing - -override_dh_strip: - dh_strip --dbg-package=knot-resolver-dbg +override_dh_auto_build: + dh_auto_build -- doc + dh_auto_build -- 2.47.2