]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
distro/pkg/deb: use meson through debhelper docs-develop-pkg-ty1oeh/deployments/6838
authorJakub Ružička <jakub.ruzicka@nic.cz>
Thu, 22 May 2025 12:35:18 +0000 (14:35 +0200)
committerJakub Ružička <jakub.ruzicka@nic.cz>
Thu, 22 May 2025 12:35:18 +0000 (14:35 +0200)
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

index c577476096ff3cef7971bddcdbe8746374359471..15a31ae3a9d9f8f32c6656a28214384380bd3e9f 100755 (executable)
@@ -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