Some more patches for 4.5.01-1.2 attached.

Cheers Jochen
From 0cb842a20a6e642fdd5014479402d503bb34ffc7 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <jspri...@debian.org>
Date: Thu, 27 Mar 2025 16:56:15 +0100
Subject: [PATCH 3/3] Update changelog for 4.5.01-1.2 release

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 32e77f8..1e3efa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kokkos (4.5.01-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Disable tests on slow archs as they run into timeouts
+  * Fix multi arch according to the MA hinter
+
+ -- Jochen Sprickerhof <jspri...@debian.org>  Thu, 27 Mar 2025 16:54:28 +0100
+
 kokkos (4.5.01-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
-- 
2.49.0

From 8c0880a171173b7177a09805271c835e25113d75 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <jspri...@debian.org>
Date: Thu, 27 Mar 2025 16:53:54 +0100
Subject: [PATCH 2/3] Fix multi arch according to the MA hinter

---
 debian/control               | 1 +
 debian/libkokkos-dev.install | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e264bba..cd74df4 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Rules-Requires-Root: no
 
 Package: kokkos
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: C++ Performance Portability Programming
  This implements a programming model in C++ for writing performance
diff --git a/debian/libkokkos-dev.install b/debian/libkokkos-dev.install
index d399ca2..30ccf82 100644
--- a/debian/libkokkos-dev.install
+++ b/debian/libkokkos-dev.install
@@ -1,3 +1,3 @@
 usr/include/* usr/include
 usr/lib/*/*.so usr/lib/${DEB_HOST_MULTIARCH}/
-usr/lib/*/cmake usr/lib
+usr/lib/*/cmake usr/lib/${DEB_HOST_MULTIARCH}/
-- 
2.49.0

From 8d552956b2222ef4a2f6ca100e3b38422d0308b4 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <jspri...@debian.org>
Date: Thu, 27 Mar 2025 16:51:55 +0100
Subject: [PATCH 1/3] Disable tests on slow archs as they run into timeouts

---
 debian/rules | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 45be831..cfa53bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,17 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@
 
+ifneq (,$(filter $(DEB_BUILD_ARCH),ppc64el alpha ppc64 sparc64))
+  RUN_TESTS=
+else
+  RUN_TESTS=-DKokkos_ENABLE_TESTS=ON
+endif
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	-DBUILD_SHARED_LIBS=ON \
 	-DKokkos_ENABLE_OPENMP=ON \
-	-DKokkos_ENABLE_TESTS=ON
+	$(RUN_TESTS)
 
 # Tests use all CPUs and would run into time outs when blocked
 override_dh_auto_test:
-- 
2.49.0

Attachment: signature.asc
Description: PGP signature

Reply via email to