sgx-sdk/ipp-crypto: 2021.7 -> 2021.9.0
- Removes `sgx-sdk` dependency on EOL OpenSSL v1.1 - Updated ipp-crypto version is technically beyond the upstream `linux-sgx` repo's pinned version, but appears to work just as well. Diff: <https://github.com/intel/ipp-crypto/compare/ippcp_2021.7...ippcp_2021.9.0> Changelog: <https://github.com/intel/ipp-crypto/blob/ippcp_2021.9.0/CHANGELOG.md>
This commit is contained in:
parent
d8958b1861
commit
8d2a5753fd
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchzip
|
||||
, autoconf
|
||||
, automake
|
||||
, binutils
|
||||
@ -13,10 +12,9 @@
|
||||
, git
|
||||
, libtool
|
||||
, linkFarmFromDrvs
|
||||
, nasm
|
||||
, ocaml
|
||||
, ocamlPackages
|
||||
, openssl_1_1
|
||||
, openssl
|
||||
, perl
|
||||
, python3
|
||||
, texinfo
|
||||
@ -106,7 +104,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
libtool
|
||||
openssl_1_1
|
||||
openssl
|
||||
];
|
||||
|
||||
BINUTILS_DIR = "${binutils}/bin";
|
||||
|
@ -2,19 +2,19 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, nasm
|
||||
, openssl_1_1
|
||||
, openssl
|
||||
, python3
|
||||
, extraCmakeFlags ? [ ]
|
||||
}:
|
||||
gcc11Stdenv.mkDerivation rec {
|
||||
pname = "ipp-crypto";
|
||||
version = "2021.7";
|
||||
version = "2021.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "ipp-crypto";
|
||||
rev = "ippcp_${version}";
|
||||
hash = "sha256-3W0LlJgmrp2Rk7xQ+0GQfkF2UpH4htx9R7IL86smtnY=";
|
||||
hash = "sha256-+ITnxyrkDQp4xRa+PVzXdYsSkI5sMNwQGfGU+lFJ6co=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DARCH=intel64" ] ++ extraCmakeFlags;
|
||||
@ -22,9 +22,7 @@ gcc11Stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
nasm
|
||||
# TODO(phlip9): The most recent `ipp-crypto` version (2021.9) now uses
|
||||
# OpenSSL v3 so we can avoid this EOL version when sgx-sdk updates.
|
||||
openssl_1_1
|
||||
openssl
|
||||
python3
|
||||
];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user