mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
sys-auth/yubico-piv-tool: explicitly set thread flags for ykcs11
Part of the library explicitly calls the pthread API. Closes: https://bugs.gentoo.org/741957 Signed-off-by: Marek Szuba <marecki@gentoo.org>
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
--- a/ykcs11/CMakeLists.txt
|
||||
+++ b/ykcs11/CMakeLists.txt
|
||||
@@ -30,7 +30,7 @@
|
||||
link_directories(${PCSC_LIBRARY_DIRS})
|
||||
add_definitions(-DCRYPTOKI_EXPORTS)
|
||||
if(NOT WIN32)
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -pthread")
|
||||
endif(NOT WIN32)
|
||||
|
||||
set(
|
||||
@@ -63,7 +63,7 @@
|
||||
# static library
|
||||
if(BUILD_STATIC_LIB)
|
||||
add_library(ykcs11 STATIC ${SOURCE})
|
||||
- target_link_libraries(ykcs11 ${LIBCRYPTO_LDFLAGS} ykpiv_static)
|
||||
+ target_link_libraries(ykcs11 ${LIBCRYPTO_LDFLAGS} -pthread ykpiv_static)
|
||||
set_target_properties (ykcs11 PROPERTIES COMPILE_FLAGS "-DSTATIC ")
|
||||
if(WIN32)
|
||||
set_target_properties(ykcs11 PROPERTIES OUTPUT_NAME ykcs11_static)
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
# dynamic library
|
||||
add_library(ykcs11_shared SHARED ${SOURCE})
|
||||
-target_link_libraries(ykcs11_shared ${LIBCRYPTO_LDFLAGS} ykpiv_shared)
|
||||
+target_link_libraries(ykcs11_shared ${LIBCRYPTO_LDFLAGS} -pthread ykpiv_shared)
|
||||
set_target_properties(ykcs11_shared PROPERTIES SOVERSION ${SO_VERSION} VERSION ${VERSION})
|
||||
set_target_properties(ykcs11_shared PROPERTIES INSTALL_RPATH "${YKPIV_INSTALL_LIB_DIR}")
|
||||
if(WIN32)
|
||||
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.1.1-install-man-page.patch
|
||||
"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
|
||||
"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
|
||||
)
|
||||
|
||||
S="${WORKDIR}/${PN}-${P}"
|
||||
|
||||
Reference in New Issue
Block a user