View | Details | Raw Unified | Return to bug 248049
Collapse All | Expand All

(-)security/yubico-piv-tool/files/patch-CMakeLists.txt (-15 lines)
Lines 1-15 Link Here
1
--- CMakeLists.txt.orig	2020-07-10 13:45:10 UTC
2
+++ CMakeLists.txt
3
@@ -121,9 +121,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
4
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
5
 endif()
6
 
7
-include(${CMAKE_SOURCE_DIR}/cmake/openssl.cmake)
8
-find_libcrypto()
9
-include_directories(${LIBCRYPTO_INCLUDE_DIRS})
10
+# include(${CMAKE_SOURCE_DIR}/cmake/openssl.cmake)
11
+# find_libcrypto()
12
+# include_directories(${LIBCRYPTO_INCLUDE_DIRS})
13
 
14
 enable_testing()
15
 find_package(codecov)
(-)security/yubico-piv-tool/files/patch-cmake_openssl.cmake (+36 lines)
Line 0 Link Here
1
--- cmake/openssl.cmake.orig	2020-07-14 19:27:32 UTC
2
+++ cmake/openssl.cmake
3
@@ -32,7 +32,7 @@ macro (find_libcrypto)
4
             if(OPENSSL_STATIC_LINK)
5
                 set(OPENSSL_USE_STATIC_LIBS TRUE) #Need to be set so that find_package would find the static library
6
             endif(OPENSSL_STATIC_LINK)
7
-            find_package(OpenSSL REQUIRED)
8
+            find_package(OpenSSL)
9
 
10
             if(OpenSSL_FOUND)
11
                 set(LIBCRYPTO_LDFLAGS OpenSSL::Crypto)
12
@@ -60,7 +60,7 @@ macro (find_libcrypto)
13
         if(NOT LIBCRYPTO_FOUND)
14
 
15
             set(ENV{PKG_CONFIG_PATH} "${OPENSSL_PKG_PATH}:$ENV{PKG_CONFIG_PATH}")
16
-            pkg_check_modules(LIBCRYPTO REQUIRED libcrypto)
17
+            pkg_check_modules(LIBCRYPTO libcrypto)
18
             if(LIBCRYPTO_FOUND)
19
                 if(VERBOSE_CMAKE)
20
                     message("LIBCRYPTO_FOUND: ${LIBCRYPTO_FOUND}")
21
@@ -76,7 +76,7 @@ macro (find_libcrypto)
22
                     message("LIBCRYPTO_LIBDIR: ${LIBCRYPTO_LIBDIR}")
23
                 endif(VERBOSE_CMAKE)
24
             else(LIBCRYPTO_FOUND)
25
-                message (FATAL_ERROR "libcrypto not found. Aborting...")
26
+                #message (FATAL_ERROR "libcrypto not found. Aborting...")
27
             endif(LIBCRYPTO_FOUND)
28
             set(OPENSSL_VERSION ${LIBCRYPTO_VERSION})
29
 
30
@@ -89,4 +89,4 @@ macro (find_libcrypto)
31
     link_directories(${LIBCRYPTO_LIBRARY_DIRS})
32
     include_directories(${LIBCRYPTO_INCLUDE_DIRS})
33
 
34
-endmacro()
35
\ No newline at end of file
36
+endmacro()

Return to bug 248049