From: Simon McVittie <smcv@debian.org>
Date: Wed, 31 Aug 2022 08:44:06 +0000 (+0100)
Subject: d/control, d/rules: Disable gjs-based tests on armel
X-Git-Tag: archive/raspbian/2024.8-1+rpi1^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=10b1424486b7ae8c0a9ac02ebc1dfdc25cc7479b;p=ostree.git

d/control, d/rules: Disable gjs-based tests on armel

It's looking as though mozjs128, and therefore the next gjs release,
will not support armel due to its lack of atomic instructions causing
relatively basic features to be disabled.
---

diff --git a/debian/control b/debian/control
index f87a2fa0..e05fbd7a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
  elfutils,
  fuse3:native,
  gir1.2-gio-2.0-dev,
- gjs:native [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
+ gjs:native [!alpha !armel !hppa !ia64 !m68k !sh4 !sparc64 !x32],
  gnupg <!nocheck>,
  gobject-introspection,
  gobject-introspection (>= 1.78.1-7~) <cross>,
@@ -195,7 +195,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 9d04f32f..65066d2e 100644
--- a/debian/ostree-tests.lintian-overrides
+++ b/debian/ostree-tests.lintian-overrides
@@ -10,4 +10,4 @@ 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 sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
+[alpha armel hppa ia64 m68k sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
diff --git a/debian/rules b/debian/rules
index 24ec8991..8780eb7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ configure_options = \
 	--without-smack \
 	$(NULL)
 
-ifneq ($(filter alpha hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
+ifneq ($(filter alpha armel hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
 configure_options += ac_cv_path_GJS=
 endif