Temporarily disable tests on 32-bit non-i386 architectures
This should help to resolve cyclic build-dependencies during the 64-bit time_t transition.
This commit is contained in:
		
							
								
								
									
										18
									
								
								debian/control
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								debian/control
									
									
									
									
										vendored
									
									
								
							| @ -3,16 +3,16 @@ Section: libs | |||||||
| Priority: optional | Priority: optional | ||||||
| Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> | Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> | ||||||
| Uploaders: Simon McVittie <smcv@debian.org>, Dmitry Shachnev <mitya57@debian.org>, Jeremy Bícha <jbicha@ubuntu.com> | Uploaders: Simon McVittie <smcv@debian.org>, Dmitry Shachnev <mitya57@debian.org>, Jeremy Bícha <jbicha@ubuntu.com> | ||||||
| Build-Depends: adwaita-icon-theme (>= 45.0-4~) <!nocheck>, | Build-Depends: adwaita-icon-theme (>= 45.0-4~) [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, | ||||||
|                at-spi2-core <!nocheck>, |                at-spi2-core [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, | ||||||
|                dbus-daemon <!nocheck>, |                dbus-daemon [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, | ||||||
|                debhelper-compat (= 13), |                debhelper-compat (= 13), | ||||||
|                dh-sequence-gir, |                dh-sequence-gir, | ||||||
|                docbook-xml <!nodoc>, |                docbook-xml <!nodoc>, | ||||||
|                docbook-xsl <!nodoc>, |                docbook-xsl <!nodoc>, | ||||||
|                dpkg-dev (>= 1.22.5), |                dpkg-dev (>= 1.22.5), | ||||||
|                fonts-cantarell <!nocheck>, |                fonts-cantarell [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, | ||||||
|                fonts-dejavu-core <!nocheck>, |                fonts-dejavu-core [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, | ||||||
|                gir1.2-atk-1.0-dev <pkg.gobject-introspection.todo>, |                gir1.2-atk-1.0-dev <pkg.gobject-introspection.todo>, | ||||||
|                gir1.2-cairo-1.0-dev | libgirepository1.0-dev, |                gir1.2-cairo-1.0-dev | libgirepository1.0-dev, | ||||||
|                gir1.2-gdkpixbuf-2.0-dev, |                gir1.2-gdkpixbuf-2.0-dev, | ||||||
| @ -22,7 +22,7 @@ Build-Depends: adwaita-icon-theme (>= 45.0-4~) <!nocheck>, | |||||||
|                gnome-pkg-tools (>= 0.11), |                gnome-pkg-tools (>= 0.11), | ||||||
|                gobject-introspection (>= 1.78.1-9~) | libgirepository1.0-dev (>= 1.41.3), |                gobject-introspection (>= 1.78.1-9~) | libgirepository1.0-dev (>= 1.41.3), | ||||||
|                gobject-introspection (>= 1.78.1-9~) <cross>, |                gobject-introspection (>= 1.78.1-9~) <cross>, | ||||||
|                gsettings-desktop-schemas <!nocheck>, |                gsettings-desktop-schemas [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, | ||||||
|                libatk-bridge2.0-dev (>= 2.15.1), |                libatk-bridge2.0-dev (>= 2.15.1), | ||||||
|                libatk1.0-dev (>= 2.35.1), |                libatk1.0-dev (>= 2.35.1), | ||||||
|                libcairo2-dev (>= 1.14.0), |                libcairo2-dev (>= 1.14.0), | ||||||
| @ -39,7 +39,7 @@ Build-Depends: adwaita-icon-theme (>= 45.0-4~) <!nocheck>, | |||||||
|                libharfbuzz-dev (>= 2.2.0), |                libharfbuzz-dev (>= 2.2.0), | ||||||
|                libjson-glib-dev:native, |                libjson-glib-dev:native, | ||||||
|                libpango1.0-dev (>= 1.44.0), |                libpango1.0-dev (>= 1.44.0), | ||||||
|                librsvg2-common [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64 sparc64] <!nocheck>, |                librsvg2-common [amd64 arm64 i386 mips64el ppc64el s390x ppc64 riscv64 sparc64] <!nocheck>, | ||||||
|                libwayland-dev (>= 1.14.91) [linux-any], |                libwayland-dev (>= 1.14.91) [linux-any], | ||||||
|                libx11-dev, |                libx11-dev, | ||||||
|                libxcomposite-dev, |                libxcomposite-dev, | ||||||
| @ -59,9 +59,9 @@ Build-Depends: adwaita-icon-theme (>= 45.0-4~) <!nocheck>, | |||||||
|                pkgconf:native, |                pkgconf:native, | ||||||
|                sassc, |                sassc, | ||||||
|                wayland-protocols (>= 1.17) [linux-any], |                wayland-protocols (>= 1.17) [linux-any], | ||||||
|                xauth <!nocheck>, |                xauth [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, | ||||||
|                xsltproc <!nodoc>, |                xsltproc <!nodoc>, | ||||||
|                xvfb <!nocheck> |                xvfb [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, | ||||||
| Build-Depends-Indep: gtk-doc-tools (>= 1.20) <!nodoc>, | Build-Depends-Indep: gtk-doc-tools (>= 1.20) <!nodoc>, | ||||||
|                      libatk1.0-doc <!nodoc>, |                      libatk1.0-doc <!nodoc>, | ||||||
|                      libcairo2-doc <!nodoc>, |                      libcairo2-doc <!nodoc>, | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							| @ -209,7 +209,7 @@ endif | |||||||
| override_dh_auto_test: | override_dh_auto_test: | ||||||
| # The tests require librsvg2-common which is only available on architectures | # The tests require librsvg2-common which is only available on architectures | ||||||
| # where rust has been ported to, disable the tests on the other ones | # where rust has been ported to, disable the tests on the other ones | ||||||
| ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64 sparc64)) | ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386 mips64el ppc64el s390x ppc64 riscv64 sparc64)) | ||||||
| ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) | ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) | ||||||
| 	# So that gsettings can find the (uninstalled) gtk schemas | 	# So that gsettings can find the (uninstalled) gtk schemas | ||||||
| 	mkdir -p debian/build/glib-2.0/schemas/ | 	mkdir -p debian/build/glib-2.0/schemas/ | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Simon McVittie
					Simon McVittie