[neon/qt/qt5webkit/Neon/release] debian: merge salsa

[Jonathan Esk-Riddell]

Git commit 60f5b07a689467840d0eae923f5e67b629f69f96 by Jonathan Esk-Riddell.
Committed on 31/10/2022 at 11:10.
Pushed by jriddell into branch 'Neon/release'.

merge salsa

M  +3    -1    debian/rules

https://invent.kde.org/neon/qt/qt5webkit/commit/60f5b07a689467840d0eae923f5e67b629f69f96

diff --cc debian/rules
index 5e8e46d,3ee887b..001dde0
--- a/debian/rules
+++ b/debian/rules
@@@ -45,11 -41,11 +45,13 @@@ ifneq (,$(filter $(DEB_HOST_ARCH_CPU),p
  	EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON
  endif
  
 +EXTRA_CMAKE_ARGUMENTS += -DCMAKE_BUILD_TYPE=Release
 +
  # webkit2gtk does a similar thing, see their prefer-pthread.patch
+ # since glibc 2.34, the THREADS_PREFER_PTHREAD_FLAG flag in CMake does not work
+ # to link atomic
  ifeq ($(DEB_HOST_ARCH),riscv64)
-     EXTRA_CMAKE_ARGUMENTS += -DTHREADS_PREFER_PTHREAD_FLAG=ON
+ 	export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
  endif
  
  %: