From e7310a62c961ad0223fc09108b3b61c3e12b3edc Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Tue, 25 Jun 2024 16:28:26 +0000 Subject: [PATCH] unconditionally-use-libatomic =================================================================== Gbp-Pq: Name unconditionally-use-libatomic.patch --- CMakeLists.txt | 4 ++-- lib-src/libscorealign/Makefile.linux | 2 +- libraries/lib-import-export/riff-test-util/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b495e56..b1c5f86b 100644 --- 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 b4e56bf2..1ee5c6da 100644 --- 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 5939843f..3e72861d 100644 --- 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 ) -- 2.30.2