Bug#1094994: vtk9: Please disable java & tbb on hurd-amd64 too

[Samuel Thibault]

Samuel Thibault, le dim. 02 févr. 2025 11:45:31 +0100, a ecrit:
> hurd-amd64 also needs java and tbb being disabled, could you apply the
> attached patch?

Actually, better use the attached patch will be already good for
hurd-arm64 when we will have it.

Samuel
-------------- next part --------------
--- debian/control.original	2025-02-02 00:56:55.000000000 +0000
+++ debian/control	2025-02-02 00:56:57.000000000 +0000
@@ -117,7 +117,7 @@
          libproj-dev,
          libpython3-dev,
          libswscale-dev,
-         libtbb-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !alpha !ia64],
+         libtbb-dev [!hurd-any !kfreebsd-any !alpha !ia64],
          libtheora-dev,
          libtiff-dev,
          libutfcpp-dev,
--- debian/rules.original	2025-02-02 15:23:24.619795666 +0100
+++ debian/rules	2025-02-02 15:25:09.600382747 +0100
@@ -3,8 +3,9 @@
 
 include /usr/share/dpkg/architecture.mk
 
-nojava_archs=hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64
-ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(nojava_archs)))
+nojava_archs=hppa
+nojava_os=hurd kfreebsd
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(nojava_archs))$(filter $(DEB_BUILD_ARCH_OS), $(nojava_os)))
   export JAVA_HOME=/usr/lib/jvm/default-java
   extra_flags += -DVTK_WRAP_JAVA=ON
 endif
@@ -14,8 +15,9 @@
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif
 
-notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64
-ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(notbb_archs)))
+notbb_archs=
+notbb_os=hurd kfreebsd
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(notbb_archs))$(filter $(DEB_BUILD_ARCH_OS), $(notbb_os)))
   extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB"
 else
   extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP"