blob: ea64e580547915eba7db29a9629c27c4db2ae411 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Due to there is no 1, 2byte atomic instruction in 64bit RISC-V hardware,
the software layer have to emulate relavant function in atomic library
Let's explicitly pass -pthread here to work around pthread builtin since glibc version 2.34
as the "-pthread" option will pull in libatomic for machines like RISC-V
the command of "gcc dumpspecs | grep pthread" will show accordingly in RISC-V:
pthread:--push-state --as-needed -latomic --pop-state
https://bugs.gentoo.org/836125
https://github.com/libjxl/libjxl/issues/1283
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4df740b..59c7f03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,6 +190,9 @@ endif() # JPEGXL_STATIC
# Threads
set(THREADS_PREFER_PTHREAD_FLAG YES)
find_package(Threads REQUIRED)
+if(CMAKE_USE_PTHREADS_INIT)
+ target_link_libraries(Threads::Threads INTERFACE -pthread)
+endif()
if(JPEGXL_STATIC)
if (MINGW)
diff --git a/tools/conformance/CMakeLists.txt b/tools/conformance/CMakeLists.txt
index bd25b1c..d125dc5 100644
--- a/tools/conformance/CMakeLists.txt
+++ b/tools/conformance/CMakeLists.txt
@@ -4,7 +4,7 @@
# license that can be found in the LICENSE file.
add_executable(djxl_conformance djxl_conformance.cc)
-target_link_libraries(djxl_conformance jxl_dec)
+target_link_libraries(djxl_conformance jxl_dec -pthread)
if(BUILD_TESTING AND CMAKE_EXECUTABLE_SUFFIX STREQUAL "")
# Script to validate the tooling.
|
GitWeb
