From 87c78f16ad8d22dec4f6631f1dd03ba02d83d615 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 31 Aug 2022 09:44:06 +0100 Subject: [PATCH] d/control, d/rules: Disable gjs-based tests on armel It's looking as though mozjs102, and therefore the next gjs release, will not support armel due to its lack of atomic instructions. --- debian/control | 4 ++-- debian/ostree-tests.lintian-overrides | 2 +- debian/rules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index f005bb62..a6946370 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: e2fslibs-dev, elfutils, fuse3, - gjs [!alpha !hppa !ia64 !m68k !s390x !sh4 !sparc64 !x32], + gjs [!alpha !armel !hppa !ia64 !m68k !s390x !sh4 !sparc64 !x32], gnupg , gobject-introspection, gtk-doc-tools , @@ -191,7 +191,7 @@ Depends: cpio, fuse3, gir1.2-ostree-1.0, - gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32], + gjs [!alpha !armel !hppa !ia64 !m68k !sh4 !sparc64 !x32], gnupg, ostree, python3, diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides index 5ef34c47..4a963d6e 100644 --- a/debian/ostree-tests.lintian-overrides +++ b/debian/ostree-tests.lintian-overrides @@ -10,7 +10,7 @@ ostree-tests: symlink-is-self-recursive . [usr/libexec/installed-tests/libostree # other architectures mentioned here. # The test that runs this script is automatically skipped if gjs isn't # present. -[alpha hppa ia64 m68k s390x sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js) +[alpha armel hppa ia64 m68k s390x sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js) # This shared object genuinely doesn't use any libc ABIs directly, # only via GLib diff --git a/debian/rules b/debian/rules index 27f0996f..1b98b837 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,7 @@ configure_options = \ --without-smack \ $(NULL) -ifneq ($(filter alpha hppa ia64 m68k s390x sh4 sparc64 x32,$(DEB_HOST_ARCH)),) +ifneq ($(filter alpha armel hppa ia64 m68k s390x sh4 sparc64 x32,$(DEB_HOST_ARCH)),) configure_options += ac_cv_path_GJS= endif