Bug#1134481: gasnet FTBFS on riscv64, loong64 and with gcc

[Adrian Bunk]

Source: gasnet
Version: 2025.8.0-8
Severity: serious
Tags: patch
X-Debbugs-Cc: debian-loongarch at lists.debian.org, debian-riscv at lists.debian.org, Alastair McKinstry <mckinstry at debian.org>
User: debian-riscv at lists.debian.org
Usertags: riscv64
User: debian-loongarch at lists.debian.org
Usertags: loong64

https://buildd.debian.org/status/logs.php?pkg=gasnet&ver=2025.8.0-8

The attached debdiff contains the following changes:
- extend the s390x clang fix to riscv64 and loong64
- fix the gcc build
-------------- next part --------------
diff -Nru gasnet-2025.8.0/debian/patches/clang-mb.patch gasnet-2025.8.0/debian/patches/clang-mb.patch
--- gasnet-2025.8.0/debian/patches/clang-mb.patch	1970-01-01 02:00:00.000000000 +0200
+++ gasnet-2025.8.0/debian/patches/clang-mb.patch	2026-04-18 17:40:08.000000000 +0300
@@ -0,0 +1,35 @@
+Description: Fix loong64/riscv64/s390x FTBFS with clang
+Author: Adrian Bunk <bunk at debian.org>
+Bug-Debian: https://bugs.debian.org/1133135
+Forwarded: no
+Last-Update: 2026-04-20
+
+--- gasnet-2025.8.0.orig/gasnet_membar.h
++++ gasnet-2025.8.0/gasnet_membar.h
+@@ -209,7 +209,7 @@
+  #define GASNETI_RMB_IS_MB
+  #define GASNETI_WMB_IS_MB
+ #elif PLATFORM_ARCH_LOONGARCH64
+- #if PLATFORM_COMPILER_GNU
++ #if PLATFORM_COMPILER_GNU || PLATFORM_COMPILER_CLANG
+    #define gasneti_local_mb() __sync_synchronize()
+    #define gasneti_local_wmb() gasneti_local_mb()
+    #define gasneti_local_rmb() gasneti_local_mb()
+@@ -219,7 +219,7 @@
+  #define GASNETI_RMB_IS_MB
+  #define GASNETI_WMB_IS_MB
+ #elif PLATFORM_ARCH_S390
+- #if PLATFORM_COMPILER_GNU
++ #if PLATFORM_COMPILER_GNU || PLATFORM_COMPILER_CLANG
+    #define gasneti_local_mb() __sync_synchronize()
+    #define gasneti_local_wmb() gasneti_local_mb()
+    #define gasneti_local_rmb() gasneti_local_mb()
+@@ -229,7 +229,7 @@
+  #define GASNETI_RMB_IS_MB
+  #define GASNETI_WMB_IS_MB
+ #elif PLATFORM_ARCH_RISCV
+- #if PLATFORM_COMPILER_GNU
++ #if PLATFORM_COMPILER_GNU || PLATFORM_COMPILER_CLANG
+    #define gasneti_local_mb() __sync_synchronize()
+    #define gasneti_local_wmb() gasneti_local_mb()
+    #define gasneti_local_rmb() gasneti_local_mb()
diff -Nru gasnet-2025.8.0/debian/patches/s390-clang.patch gasnet-2025.8.0/debian/patches/s390-clang.patch
--- gasnet-2025.8.0/debian/patches/s390-clang.patch	2026-04-18 17:40:08.000000000 +0300
+++ gasnet-2025.8.0/debian/patches/s390-clang.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,17 +0,0 @@
-Description: Fix s390x FTBFS with clang
-Author: Adrian Bunk <bunk at debian.org>
-Forwarded: no
-Last-Updated: 2026-04-18
-
---- gasnet-2025.8.0.orig/gasnet_membar.h
-+++ gasnet-2025.8.0/gasnet_membar.h
-@@ -209,7 +209,7 @@
-  #define GASNETI_RMB_IS_MB
-  #define GASNETI_WMB_IS_MB
- #elif PLATFORM_ARCH_S390
-- #if PLATFORM_COMPILER_GNU
-+ #if PLATFORM_COMPILER_GNU || PLATFORM_COMPILER_CLANG
-    #define gasneti_local_mb() __sync_synchronize()
-    #define gasneti_local_wmb() gasneti_local_mb()
-    #define gasneti_local_rmb() gasneti_local_mb()
-
diff -Nru gasnet-2025.8.0/debian/patches/series gasnet-2025.8.0/debian/patches/series
--- gasnet-2025.8.0/debian/patches/series	2026-04-18 17:40:08.000000000 +0300
+++ gasnet-2025.8.0/debian/patches/series	2026-04-18 17:40:08.000000000 +0300
@@ -1,2 +1,2 @@
 loong64-support.patch
-s390-clang.patch
+clang-mb.patch
diff -Nru gasnet-2025.8.0/debian/rules gasnet-2025.8.0/debian/rules
--- gasnet-2025.8.0/debian/rules	2026-04-18 17:40:08.000000000 +0300
+++ gasnet-2025.8.0/debian/rules	2026-04-18 17:40:08.000000000 +0300
@@ -23,7 +23,7 @@
 PMI_HOME=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2
 export PMIX
 
-ifndef $(filter $(DEB_TARGET_ARCH), $(CLANG_ARCH))
+ifneq (,$(filter $(DEB_TARGET_ARCH), $(CLANG_ARCH)))
 CC=clang-21
 CXX=clang++-21
 else