Merge ~slavik81/ubuntu/+source/stdgpu:rm-rocm-arm64 into ubuntu/+source/stdgpu:ubuntu/devel

[Cory Bloor]

This change drops libamdhip64-dev and librocthrust-dev from the Build-Depends on arm64, as libamdhip64-dev is being removed from the archive on arm64. rocm-hipamd FTBFS on arm64 due to LP#2032624 and the problem is probably not fixable in time for the noble release.

[Cory Bloor (slavik81)]

PPA build: https://launchpad.net/~slavik81/+archive/ubuntu/ppa/+sourcepub/15930441/+listing-archive-extra

9599ed6... by Cordell Bloor <email address hidden> on 2024-04-13

d/changelog: add bug number

[Gianfranco Costamagna (costamagnagianfranco)]

review: Approve

[Gianfranco Costamagna (costamagnagianfranco)]

sponsored.

[Cory Bloor (slavik81)]

Unfortunately, it seems that between when I authored this change and when it was merged, rocthrust 5.7 finally migrated from noble-proposed into noble and it exposed an stdgpu bug from Sid [1]. The resulting build failure in noble-proposed had nothing to do with this merge request, but that's why this upload FTBFS. In the leadup to the noble release, it seems that everything that could possibly go wrong has gone wrong.

I will figure out how to fix this bug on Sid, then file another merge request once I have a solution.

[1]: https://bugs.debian.org/1064730

[Gianfranco Costamagna (costamagnagianfranco)]

rocthrust is now fixed and patch forwarded both Debian and Upstream as pull request.
I also merged stdgpu from experimental and uploaded to noble with your patch

Unmerged commits

9599ed6... by Cordell Bloor <email address hidden> on 2024-04-13

d/changelog: add bug number

2b04e9c... by Cordell Bloor <email address hidden> on 2024-04-13

Update changelog for 1.3.0+git20220507.32e0517-5ubuntu1 release

1252c95... by Cordell Bloor <email address hidden> on 2024-04-13

d/control: update package maintainer

eb0d373... by Cordell Bloor <email address hidden> on 2024-04-13

Drop HIP support on arm64

diff --git a/debian/changelog b/debian/changelog
index 41ac38a..5ed9761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+stdgpu (1.3.0+git20220507.32e0517-5ubuntu1) noble; urgency=medium
+
+  * Drop arm64 from libstdgpu-hip-dev and libstdgpu-hip0d architectures
+    (LP: #2061253)
+
+ -- Cordell Bloor <[e-mail]>  Sat, 13 Apr 2024 15:32:28 -0600
+
 stdgpu (1.3.0+git20220507.32e0517-5) unstable; urgency=medium
 
   * Fix wrong alignment test to actually provoke wrong alignment
diff --git a/debian/control b/debian/control
index a5a04f7..862b7ca 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: stdgpu
 Section: libs
 Priority: optional
-Maintainer: Timo Röhling <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Timo Röhling <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13),
  cmake (>= 3.26.4-3~),
- hipcc [amd64 arm64 ppc64el],
- libamdhip64-dev [amd64 arm64 ppc64el],
+ hipcc [amd64 ppc64el],
+ libamdhip64-dev [amd64 ppc64el],
  libgtest-dev <!nocheck>,
- librocthrust-dev [amd64 arm64 ppc64el] | libthrust-dev,
+ librocthrust-dev [amd64 ppc64el] | libthrust-dev,
 Homepage: https://github.com/stotko/stdgpu
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
@@ -48,7 +49,7 @@ Description: ${source:Synopsis} (OpenMP development headers)
  This package installs the development headers for the OpenMP version.
 
 Package: libstdgpu-hip0d
-Architecture: amd64 arm64 ppc64el
+Architecture: amd64 ppc64el
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -60,7 +61,7 @@ Description: ${source:Synopsis} (HIP backend)
 
 Package: libstdgpu-hip-dev
 Section: libdevel
-Architecture: amd64 arm64 ppc64el
+Architecture: amd64 ppc64el
 Multi-Arch: same
 Conflicts: libstdgpu-dev
 Provides: libstdgpu-dev
diff --git a/debian/rules b/debian/rules
index dcf68b1..4b2c16c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 BUILD_TESTS := $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),OFF,ON)
-BUILD_HIP := $(if $(filter amd64 arm64 ppc64el,$(DEB_HOST_ARCH)),ON,OFF)
+BUILD_HIP := $(if $(filter amd64 ppc64el,$(DEB_HOST_ARCH)),ON,OFF)
 SOVERSION := 0d
 
 %: