liboqs: 0.10.1 -> 0.11.0
This commit is contained in:
parent
f0668c1c85
commit
7caca24a1f
@ -6,14 +6,14 @@ Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR.
|
|||||||
CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR
|
CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR
|
||||||
forcibly to "/usr" breaks this.
|
forcibly to "/usr" breaks this.
|
||||||
---
|
---
|
||||||
CMakeLists.txt | 11 -----------
|
CMakeLists.txt | 9 ---------
|
||||||
1 file changed, 11 deletions(-)
|
1 file changed, 9 deletions(-)
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 288bcbe8..9750fae6 100644
|
index 0564bc8e..7b4c7f47 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake)
|
@@ -144,15 +144,6 @@ include(.CMake/compiler_opts.cmake)
|
||||||
include(.CMake/alg_support.cmake)
|
include(.CMake/alg_support.cmake)
|
||||||
|
|
||||||
if(${OQS_USE_OPENSSL})
|
if(${OQS_USE_OPENSSL})
|
||||||
@ -24,13 +24,12 @@ index 288bcbe8..9750fae6 100644
|
|||||||
- elseif(EXISTS "/opt/homebrew/opt/openssl@1.1")
|
- elseif(EXISTS "/opt/homebrew/opt/openssl@1.1")
|
||||||
- set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1")
|
- set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1")
|
||||||
- endif()
|
- endif()
|
||||||
- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
|
|
||||||
- set(OPENSSL_ROOT_DIR "/usr")
|
|
||||||
- endif()
|
- endif()
|
||||||
- endif()
|
- endif()
|
||||||
find_package(OpenSSL 1.1.1 REQUIRED)
|
find_package(OpenSSL 1.1.1 REQUIRED)
|
||||||
endif()
|
|
||||||
|
|
||||||
|
if(OQS_DLOPEN_OPENSSL)
|
||||||
|
|
||||||
--
|
--
|
||||||
2.42.0
|
2.42.0
|
||||||
|
|
||||||
|
@ -10,13 +10,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "liboqs";
|
pname = "liboqs";
|
||||||
version = "0.10.1";
|
version = "0.11.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "open-quantum-safe";
|
owner = "open-quantum-safe";
|
||||||
repo = "liboqs";
|
repo = "liboqs";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
hash = "sha256-zsSKFUs75K0Byxh3KVCZ8lIOf/vpbyMJXfk6fa2u+aE=";
|
hash = "sha256-+Gx1JPrJoeMix9DIF0rJQTivxN1lgaCIYFvJ1pnYZzM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
Loading…
Reference in New Issue
Block a user