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

This reverts commit 87c78f16ad.
Adrian Bunk and Mike Hommey were able to fix mozjs102 on armel, so we
can continue to have gjs on that architecture for Debian 12.
This commit is contained in:
Simon McVittie 2022-09-25 10:28:02 +01:00
parent 48f12592f9
commit f59d3ae52b
3 changed files with 4 additions and 4 deletions

4
debian/control vendored
View File

@ -20,7 +20,7 @@ Build-Depends:
e2fslibs-dev,
elfutils,
fuse3,
gjs [!alpha !armel !hppa !ia64 !m68k !sh4 !sparc64 !x32],
gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
gnupg <!nocheck>,
gobject-introspection,
gtk-doc-tools <!nodoc>,
@ -191,7 +191,7 @@ Depends:
cpio,
fuse3,
gir1.2-ostree-1.0,
gjs [!alpha !armel !hppa !ia64 !m68k !sh4 !sparc64 !x32],
gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
gnupg,
ostree,
python3,

View File

@ -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 armel hppa ia64 m68k sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
[alpha hppa ia64 m68k 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

2
debian/rules vendored
View File

@ -28,7 +28,7 @@ configure_options = \
--without-smack \
$(NULL)
ifneq ($(filter alpha armel hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
ifneq ($(filter alpha hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
configure_options += ac_cv_path_GJS=
endif