[hamradio-commits] [cubicsdr] 01/02: Link to libatomic

[Andreas E. Bombe]

This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository cubicsdr.

commit fa6aec912722d9c2811806464385d77c03849b6b
Author: Andreas Bombe <aeb at debian.org>
Date:   Thu Apr 6 15:10:50 2017 +0200

    Link to libatomic
    
    Closes: 8596161
---
 debian/changelog              |  6 ++++++
 debian/patches/link-libatomic | 18 ++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6844cfd..4d70572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cubicsdr (0.2.0+git20170310+dfsg-2) UNRELEASED; urgency=medium
+
+  * Link to libatomic (Closes: #859616)
+
+ -- Andreas Bombe <aeb at debian.org>  Thu, 06 Apr 2017 15:08:05 +0200
+
 cubicsdr (0.2.0+git20170310+dfsg-1) unstable; urgency=medium
 
   * Initial release (Closes: #829516)
diff --git a/debian/patches/link-libatomic b/debian/patches/link-libatomic
new file mode 100644
index 0000000..da5c6ef
--- /dev/null
+++ b/debian/patches/link-libatomic
@@ -0,0 +1,18 @@
+Description: Link libatomic
+ Some architectures do not have builtin atomic support in the compiler
+ and/or do not automatically link libatomic. This patch simply adds
+ unconditional linking to libatomic.
+Author: Andreas Bombe <aeb at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -637,7 +637,7 @@
+         configure_files(${CUBICSDR_HEADER_IMAGE_DIR} ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} ${CUBICSDR_HEADER_IMAGE_FILE})
+     ENDIF()
+     add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers} ${RES_FILES})
+-    target_link_libraries(CubicSDR ${LIQUID_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
++    target_link_libraries(CubicSDR ${LIQUID_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES} -latomic)
+ ENDIF (NOT BUNDLE_APP)
+ 
+ IF (MSVC)
diff --git a/debian/patches/series b/debian/patches/series
index a9791b9..4c6f177 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use-system-tinyxml
 disable-deb-processing
+link-libatomic

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/cubicsdr.git