From fb571e2ed9bde7eb156818810a63ef2537dbc65e Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Tue, 25 Jul 2023 18:51:13 +0200 Subject: [PATCH] chore(linux): Work around build failure on Debian mips64el --- linux/debian/changelog | 6 ++++++ linux/debian/meson/no-exe-wrapper.ini | 4 ++++ linux/debian/rules | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 linux/debian/meson/no-exe-wrapper.ini diff --git a/linux/debian/changelog b/linux/debian/changelog index 4e672643b3..76f3697d13 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +keyman (16.0.141-1) UNRELEASED; urgency=medium + + * Work around mips64el build failure (#1041499) + + -- Eberhard Beilharz Tue, 25 Jul 2023 18:49:54 +0200 + keyman (16.0.140-1) unstable; urgency=medium * New upstream release (closes: #1037707). diff --git a/linux/debian/meson/no-exe-wrapper.ini b/linux/debian/meson/no-exe-wrapper.ini new file mode 100644 index 0000000000..1633d270ec --- /dev/null +++ b/linux/debian/meson/no-exe-wrapper.ini @@ -0,0 +1,4 @@ +# Workaround for https://bugs.debian.org/1041499 in which Meson doesn't +# think mips64 can run its own binaries +[properties] +needs_exe_wrapper = false diff --git a/linux/debian/rules b/linux/debian/rules index 6dfa7aa927..27df04ddfc 100755 --- a/linux/debian/rules +++ b/linux/debian/rules @@ -14,6 +14,19 @@ export LC_ALL=C.UTF-8 include /usr/share/dpkg/pkg-info.mk +# Workaround for https://bugs.debian.org/1041499 and +# https://github.com/mesonbuild/meson/issues/12017 +# --native-file got added in Meson 0.49, so we check for that version here +MESON_049_OR_HIGHER := $(shell expr `meson --version | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 04900) + +configure_options := + +ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) +ifeq ($(MESON_049_OR_HIGHER), 1) +configure_options += --native-file=$(CURDIR)/debian/meson/no-exe-wrapper.ini +endif +endif + # Unfortunately dh-python 3.20180325 (bionic) doesn't provide the virtual dh-sequence-python3 # package, so we'll have to pass --with-python3 here %: @@ -24,7 +37,7 @@ override_dh_auto_configure: cd core && \ ./build.sh configure -- --wrap-mode=nodownload --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libdir=lib/$(DEB_TARGET_MULTIARCH) \ - --libexecdir=lib/$(DEB_TARGET_MULTIARCH) + --libexecdir=lib/$(DEB_TARGET_MULTIARCH) $(configure_options) # ibus-keyman cd linux/ibus-keyman && \ cp -f ../../VERSION.md VERSION && \