Control: tags 1133667 + patch Control: tags 1133667 + pending Dear maintainer,
I've prepared an NMU for wsclean (versioned as 3.7-1.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for wsclean-3.7 wsclean-3.7 changelog | 8 + patches/0001-Fix-compilation-with-gcc-16.patch | 24 +++++ patches/Link-libatomic-against-wsclean-lib-on-riscv64-and-fix-FTB.patch | 47 ---------- patches/series | 2 4 files changed, 33 insertions(+), 48 deletions(-) diff -Nru wsclean-3.7/debian/changelog wsclean-3.7/debian/changelog --- wsclean-3.7/debian/changelog 2026-02-20 20:06:30.000000000 +0200 +++ wsclean-3.7/debian/changelog 2026-08-10 20:52:39.000000000 +0300 @@ -1,3 +1,11 @@ +wsclean (3.7-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with GCC 16. (Closes: #1133667) + * Remove no longer needed libatomic linking on riscv64. + + -- Adrian Bunk <[email protected]> Mon, 10 Aug 2026 20:52:39 +0300 + wsclean (3.7-1) unstable; urgency=medium * New upstream version 3.7 (Closes: #1125732) diff -Nru wsclean-3.7/debian/patches/0001-Fix-compilation-with-gcc-16.patch wsclean-3.7/debian/patches/0001-Fix-compilation-with-gcc-16.patch --- wsclean-3.7/debian/patches/0001-Fix-compilation-with-gcc-16.patch 1970-01-01 02:00:00.000000000 +0200 +++ wsclean-3.7/debian/patches/0001-Fix-compilation-with-gcc-16.patch 2026-08-10 20:52:31.000000000 +0300 @@ -0,0 +1,24 @@ +From acecbb6ebccabd10d498569776f84da9dc20a4e8 Mon Sep 17 00:00:00 2001 +From: André Offringa <[email protected]> +Date: Mon, 13 Apr 2026 16:51:38 +0200 +Subject: Fix compilation with gcc-16 + +--- + include/schaapcommon/reordering/reordering.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/external/schaapcommon/include/schaapcommon/reordering/reordering.h b/external/schaapcommon/include/schaapcommon/reordering/reordering.h +index 8e0adfd..d0e4e06 100644 +--- a/external/schaapcommon/include/schaapcommon/reordering/reordering.h ++++ b/external/schaapcommon/include/schaapcommon/reordering/reordering.h +@@ -4,6 +4,7 @@ + #ifndef SCHAAPCOMMON_REORDERING_H_ + #define SCHAAPCOMMON_REORDERING_H_ + ++#include <cstdint> + #include <string> + #include <map> + #include <vector> +-- +2.47.3 + diff -Nru wsclean-3.7/debian/patches/Link-libatomic-against-wsclean-lib-on-riscv64-and-fix-FTB.patch wsclean-3.7/debian/patches/Link-libatomic-against-wsclean-lib-on-riscv64-and-fix-FTB.patch --- wsclean-3.7/debian/patches/Link-libatomic-against-wsclean-lib-on-riscv64-and-fix-FTB.patch 2026-02-20 20:06:30.000000000 +0200 +++ wsclean-3.7/debian/patches/Link-libatomic-against-wsclean-lib-on-riscv64-and-fix-FTB.patch 1970-01-01 02:00:00.000000000 +0200 @@ -1,47 +0,0 @@ -From: Eric Long <[email protected]> -Date: Fri, 26 Aug 2022 13:11:39 +0800 -Subject: Link libatomic against wsclean-lib on riscv64 and fix FTBFS - -Dear maintainer, - -wsclean failed to build on riscv64: - -``` -[100%] Built target wsclean-shared -/usr/bin/ld: libwsclean.a(msgridderbase.cpp.o): in function `MSGridderBase::getAvailableMemory(double, double)': -./obj-riscv64-linux-gnu/./gridding/msgridderbase.cpp:300: undefined reference to `__atomic_exchange_1' -collect2: error: ld returned 1 exit status -make[3]: *** [CMakeFiles/wsclean.dir/build.make:154: wsclean] Error 1 -make[3]: Leaving directory '/<<PKGBUILDDIR>>/obj-riscv64-linux-gnu' -make[2]: *** [CMakeFiles/Makefile2:286: CMakeFiles/wsclean.dir/all] Error 2 -make[2]: Leaving directory '/<<PKGBUILDDIR>>/obj-riscv64-linux-gnu' -make[1]: *** [Makefile:139: all] Error 2 -make[1]: Leaving directory '/<<PKGBUILDDIR>>/obj-riscv64-linux-gnu' -dh_auto_build: error: cd obj-riscv64-linux-gnu && make -j4 "INSTALL=install --strip-program=true" VERBOSE=1 returned exit code 2 -make: *** [debian/rules:10: binary-arch] Error 25 -dpkg-buildpackage: error: debian/rules binary-arch subprocess returned exit status 2 -``` - -Attached is a patch that links libatomic on riscv64 and fixes FTBFS, tested on -my QEMU riscv64 machine. Please let me know if I missed something. - -Cheers, -Eric ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0cb8428..f910c28 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -456,6 +456,9 @@ list(PREPEND EXTERNAL_LIBRARIES ${RADLER_LIB}) - - add_library(wsclean-lib STATIC) - target_link_libraries(wsclean-lib PRIVATE ${EXTERNAL_LIBRARIES} wsclean-object) -+if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "riscv64") -+ target_link_libraries(wsclean-lib PRIVATE -latomic) -+endif() - set_target_properties(wsclean-lib PROPERTIES OUTPUT_NAME wsclean) - - add_library(wsclean-shared SHARED interface/wsclean.cpp) diff -Nru wsclean-3.7/debian/patches/series wsclean-3.7/debian/patches/series --- wsclean-3.7/debian/patches/series 2026-02-20 20:06:30.000000000 +0200 +++ wsclean-3.7/debian/patches/series 2026-08-10 20:52:39.000000000 +0300 @@ -1,7 +1,7 @@ Install-libs-in-multi-arch-path.patch Don-t-use-RPATH.patch Don-t-try-SIMD-on-non-x86-processors-not-implemented-yet.patch -Link-libatomic-against-wsclean-lib-on-riscv64-and-fix-FTB.patch Don-t-fetch-XTensor-from-git.patch Fix-xtensor.h-location.patch Add-SOVERSION-and-use-shared-lib-for-wsclean.patch +0001-Fix-compilation-with-gcc-16.patch
