[neon/extras/kdiff3/Neon/release] debian: try a different approach for -latomic

[Pino Toscano]

Git commit 29716c978d7fb5252ecba1e0ea01d0186b152363 by Pino Toscano.
Committed on 15/08/2021 at 21:03.
Pushed by jriddell into branch 'Neon/release'.

try a different approach for -latomic

M  +5    -0    debian/changelog
D  +0    -13   debian/patches/libatomic.diff
D  +0    -1    debian/patches/series
M  +5    -0    debian/rules

https://invent.kde.org/neon/extras/kdiff3/commit/29716c978d7fb5252ecba1e0ea01d0186b152363

diff --git a/debian/changelog b/debian/changelog
index 1803bf4..aa91225 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 kdiff3 (1.9.2-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Replace patch libatomic.diff by specifying -latomic instead via
+    dpkg-buildflags, making sure it cannot be left out by as-needed;
+    this is done on armel, and powerpc for now.
+    Hopefully, this should fix linking the atomic functions.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 15 Aug 2021 22:58:05 +0200
 
diff --git a/debian/patches/libatomic.diff b/debian/patches/libatomic.diff
deleted file mode 100644
index 9623f4a..0000000
--- a/debian/patches/libatomic.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Adding libatomic for some 32 bit targets
-Author: eike at debian.org
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -68,7 +68,7 @@ set_package_properties(KF5DocTools PROPE
- option(ENABLE_AUTO "Enable kdiff3's '--auto' flag" ON)
- option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version >=3.6" OFF)
- 
--set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons )
-+set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons atomic )
- 
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     #Adjust clang specific  warnings
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2829210..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-libatomic.diff
diff --git a/debian/rules b/debian/rules
index 809b7e0..84904b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+archs_that_need_atomic = armel powerpc
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_that_need_atomic)))
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
+endif
+
 %:
 	dh $@ --with kf5