unconditionally-use-libatomic

===================================================================

Gbp-Pq: Name unconditionally-use-libatomic.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b495e5661fc7878da50bdc7e0ae88b0ed75a98d..b1c5f86b00415855c46e8e6b428e235e3cb59a61 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -470,9 +470,9 @@ if( HAVE_LIBM )
 endif()
 
 check_library_exists( atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC )
-if( HAVE_LIBATOMIC )
+#if( HAVE_LIBATOMIC )
   list( APPEND CMAKE_REQUIRED_LIBRARIES -latomic )
-endif()
+#endif()
 
 # Add the dynamic linker library (if needed) to the list of required libraries
 list( APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS} )

diff --git a/lib-src/libscorealign/Makefile.linux b/lib-src/libscorealign/Makefile.linux
index b4e56bf23b32cf71e4adde71628764c3b5ab69c9..1ee5c6da53bd678c0038264f900c2d984d04f078 100644 (file)
--- a/lib-src/libscorealign/Makefile.linux
+++ b/lib-src/libscorealign/Makefile.linux
@@ -25,7 +25,7 @@ cc = gcc $(c_opts)
 c++ = g++ $(c_opts)
 cclink = gcc
 c++link = g++
-syslibs = -lm
+syslibs = -lm -latomic
 
 scorealign_o = comp_chroma.o gen_chroma.o scorealign.o snd/audionone.o \
                snd/sndcvt.o snd/sndheader.o snd/sndio.o snd/snd.o \

diff --git a/libraries/lib-import-export/riff-test-util/CMakeLists.txt b/libraries/lib-import-export/riff-test-util/CMakeLists.txt
index 5939843feb2514866871af2ec7c09325f62e0e76..3e72861d45cb88aae2682acf3eb3349f7818de2f 100644 (file)
--- a/libraries/lib-import-export/riff-test-util/CMakeLists.txt
+++ b/libraries/lib-import-export/riff-test-util/CMakeLists.txt
@@ -3,5 +3,5 @@ add_executable(riff-test-util
 )
 
 target_link_libraries(riff-test-util
-   lib-import-export
+   lib-import-export atomic
 )