diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2020-09-12 21:51:06 +0200 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2020-09-12 21:56:40 +0200 |
| commit | 51d539606ca3bdf81ca3fa041ff17d8844db7c69 (patch) | |
| tree | 6818f4b19ad948be76a00937703d912c36d727ea /sys-auth | |
| parent | dev-haskell/fclabels: drop old (diff) | |
| download | gentoo-51d539606ca3bdf81ca3fa041ff17d8844db7c69.tar.gz gentoo-51d539606ca3bdf81ca3fa041ff17d8844db7c69.tar.bz2 gentoo-51d539606ca3bdf81ca3fa041ff17d8844db7c69.zip | |
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>
Diffstat (limited to 'sys-auth')
| -rw-r--r-- | sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch | 29 | ||||
| -rw-r--r-- | sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch new file mode 100644 index 000000000000..cd85616b5e6a --- /dev/null +++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-2.1.1-ykcs11-threads.patch @@ -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) diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild index 8065e7bafa77..07beb0c0d0d4 100644 --- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild +++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.1.1-r1.ebuild @@ -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}" |