Accepting request 639499 from home:kbabioch:branches:security
OBS-URL: https://build.opensuse.org/request/show/639499 OBS-URL: https://build.opensuse.org/package/show/security/libfido2?expand=0&rev=5
This commit is contained in:
parent
9320b3e19c
commit
9c6c3c67d0
52
fix-release-build.patch
Normal file
52
fix-release-build.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From 99a9be59b77fc9e6513a2953c222b44b0dbbe91e Mon Sep 17 00:00:00 2001
|
||||||
|
From: pedro martelletto <pedro@yubico.com>
|
||||||
|
From: Karol Babioch <kbabioch@suse.de>
|
||||||
|
Date: Mon, 1 Oct 2018 15:29:52 +0200
|
||||||
|
Subject: [PATCH] only run regress tests on debug builds
|
||||||
|
|
||||||
|
do not attempt to build and run regression tests if CMAKE_BUILD_TYPE
|
||||||
|
isn't set to "Debug", as NDEBUG might be defined. pointed out by
|
||||||
|
Karol Babioch in github issue #8.
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 15 +++++++++------
|
||||||
|
5 files changed, 13 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index fc7dd5d..4c39ff3 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -24,9 +24,9 @@ add_definitions(-D_FIDO_MINOR=${FIDO_MINOR})
|
||||||
|
add_definitions(-D_FIDO_PATCH=${FIDO_PATCH})
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
- if ((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR
|
||||||
|
- (NOT CRYPTO_INCLUDE_DIRS) OR (NOT CRYPTO_LIBRARY_DIRS) OR
|
||||||
|
- (NOT HIDAPI_INCLUDE_DIRS) OR (NOT HIDAPI_LIBRARY_DIRS))
|
||||||
|
+ if((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR
|
||||||
|
+ (NOT CRYPTO_INCLUDE_DIRS) OR (NOT CRYPTO_LIBRARY_DIRS) OR
|
||||||
|
+ (NOT HIDAPI_INCLUDE_DIRS) OR (NOT HIDAPI_LIBRARY_DIRS))
|
||||||
|
message(FATAL_ERROR "please provide definitions for "
|
||||||
|
"{CBOR,CRYPTO,HIDAPI}_{INCLUDE,LIBRARY}_DIRS when building "
|
||||||
|
"under msvc")
|
||||||
|
@@ -236,6 +236,7 @@ message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
|
||||||
|
message(STATUS "CMAKE_C_COMPILER_ID: ${CMAKE_C_COMPILER_ID}")
|
||||||
|
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
|
||||||
|
message(STATUS "CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
+message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
|
||||||
|
message(STATUS "UDEV_RULES_DIR: ${UDEV_RULES_DIR}")
|
||||||
|
message(STATUS "CBOR_INCLUDE_DIRS: ${CBOR_INCLUDE_DIRS}")
|
||||||
|
message(STATUS "CBOR_LIBRARY_DIRS: ${CBOR_LIBRARY_DIRS}")
|
||||||
|
@@ -252,8 +253,10 @@ message(STATUS "FUZZ: ${FUZZ}")
|
||||||
|
subdirs(src)
|
||||||
|
subdirs(examples)
|
||||||
|
if(NOT WIN32)
|
||||||
|
-subdirs(regress)
|
||||||
|
-subdirs(tools)
|
||||||
|
-subdirs(udev)
|
||||||
|
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
|
+ subdirs(regress)
|
||||||
|
+ endif()
|
||||||
|
+ subdirs(tools)
|
||||||
|
+ subdirs(udev)
|
||||||
|
endif()
|
||||||
|
subdirs(man)
|
Loading…
Reference in New Issue
Block a user