diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-libs/libfido2/files | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-libs/libfido2/files')
| -rw-r--r-- | dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch b/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch new file mode 100644 index 000000000000..391aae014661 --- /dev/null +++ b/dev-libs/libfido2/files/libfido2-1.11.0-regress-tests.patch @@ -0,0 +1,81 @@ +https://github.com/Yubico/libfido2/pull/579 + +From c359e5dba24ae7b44cc0d61fb7c00e652465853b Mon Sep 17 00:00:00 2001 +From: Silke Hofstra <silke@slxh.eu> +Date: Fri, 6 May 2022 15:36:02 +0200 +Subject: [PATCH 1/3] regress: link against chosen library + +Compile `regress` against `${_FIDO2_LIBRARY}` so it links against +the shared library when building with `BUILD_STATIC_LIBS=OFF`. +--- a/regress/CMakeLists.txt ++++ b/regress/CMakeLists.txt +@@ -6,7 +6,7 @@ add_custom_target(regress) + + macro(add_regress_test NAME SOURCES) + add_executable(${NAME} ${SOURCES}) +- target_link_libraries(${NAME} fido2) ++ target_link_libraries(${NAME} ${_FIDO2_LIBRARY}) + add_test(${NAME} ${NAME}) + add_dependencies(regress ${NAME}) + endmacro() +@@ -17,6 +17,7 @@ if(MSVC AND BUILD_SHARED_LIBS) + "${CBOR_BIN_DIRS}/${CBOR_LIBRARIES}.dll" + "${CRYPTO_BIN_DIRS}/${CRYPTO_LIBRARIES}.dll" + "${ZLIB_BIN_DIRS}/${ZLIB_LIBRARIES}.dll" ++ "$<TARGET_FILE:${_FIDO2_LIBRARY}>" + "${CMAKE_CURRENT_BINARY_DIR}") + endif() + + +From a5413255cb0dd4579faf0dda0ce1b3e45db398e9 Mon Sep 17 00:00:00 2001 +From: Silke Hofstra <silke@slxh.eu> +Date: Mon, 9 May 2022 10:56:29 +0200 +Subject: [PATCH 3/3] regress: run compression test against static lib only + +--- a/regress/CMakeLists.txt ++++ b/regress/CMakeLists.txt +@@ -4,13 +4,22 @@ + + add_custom_target(regress) + +-macro(add_regress_test NAME SOURCES) ++macro(add_regress_test_common NAME SOURCES) + add_executable(${NAME} ${SOURCES}) +- target_link_libraries(${NAME} ${_FIDO2_LIBRARY}) + add_test(${NAME} ${NAME}) + add_dependencies(regress ${NAME}) + endmacro() + ++macro(add_regress_test NAME SOURCES) ++ add_regress_test_common(${NAME} ${SOURCES}) ++ target_link_libraries(${NAME} ${_FIDO2_LIBRARY}) ++endmacro() ++ ++macro(add_regress_static_test NAME SOURCES) ++ add_regress_test_common(${NAME} ${SOURCES}) ++ target_link_libraries(${NAME} fido2) ++endmacro() ++ + if(MSVC AND BUILD_SHARED_LIBS) + add_custom_command(TARGET regress POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy +@@ -33,13 +42,17 @@ else() + endif() + + add_regress_test(regress_assert assert.c) +-add_regress_test(regress_compress compress.c) + add_regress_test(regress_cred cred.c) + add_regress_test(regress_dev dev.c) + add_regress_test(regress_eddsa eddsa.c) + add_regress_test(regress_es256 es256.c) + add_regress_test(regress_rs256 rs256.c) + ++# Run these tests only against the static library ++if(BUILD_STATIC_LIBS) ++ add_regress_static_test(regress_compress compress.c) ++endif() ++ + if(MINGW) + # needed for nanosleep() in mingw + target_link_libraries(regress_dev winpthread) + |