gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sgx-azure-dcap-client: 1.12.3 -> 1.13.0-pre0

Browse Source
This commit is contained in:
Philip Kannegaard Hayes
2026-03-24 10:40:50 -07:00
parent bbbf5bd268
commit 6e4fc8483e
4 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/sg/sgx-azure-dcap-client/missing-includes.patch
+24
View File
@@ -0,0 +1,24 @@
diff --git a/src/Linux/curl_easy.h b/src/Linux/curl_easy.h
index 047f3e2..c9c5e83 100644
--- a/src/Linux/curl_easy.h
+++ b/src/Linux/curl_easy.h
@@ -6,6 +6,7 @@
#define CURL_EASY_H
#define _CRT_SECURE_NO_WARNINGS // Use strncpy for portability.
+#include <cstdint>
#include <cassert>
#include <cstddef>
#include <exception>
diff --git a/src/local_cache.h b/src/local_cache.h
index da86967..d9b0d3f 100644
--- a/src/local_cache.h
+++ b/src/local_cache.h
@@ -5,6 +5,7 @@
#ifndef LOCAL_CACHE_H
#define LOCAL_CACHE_H
+#include <cstdint>
#include <string>
#include <vector>
#include <memory>
pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
+5 -11
View File
@@ -1,7 +1,6 @@
{
stdenv,
fetchFromGitHub,
fetchpatch,
lib,
curl,
nlohmann_json,
@@ -36,23 +35,18 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "azure-dcap-client";
version = "1.12.3";
version = "1.13.0-pre0";
src = fetchFromGitHub {
owner = "microsoft";
repo = "azure-dcap-client";
rev = finalAttrs.version;
hash = "sha256-zTDaICsSPXctgFRCZBiZwXV9dLk2pFL9kp5a8FkiTZA=";
rev = "839ac4a2acc11b90cb91a483fcfc0cf7ae6a75c7";
hash = "sha256-dVO5cSOcpkOuxql06exS4aLJgvtRg+Oi6k8HBIjwPlg=";
};
patches = [
# Fix gcc-13 build:
# https://github.com/microsoft/Azure-DCAP-Client/pull/197
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/microsoft/Azure-DCAP-Client/commit/fbcae7b3c8f1155998248cf5b5f4c1df979483f5.patch";
hash = "sha256-ezEuQql3stn58N1ZPKMlhPpUOBkDpCcENpGwFAmWtHc=";
})
# missing `#include <cstdint>`
./missing-includes.patch
];
nativeBuildInputs = [
pkgs/by-name/sg/sgx-azure-dcap-client/test-suite.nix
+4
View File
@@ -11,7 +11,11 @@ sgx-azure-dcap-client.overrideAttrs (old: {
];
patches = (old.patches or [ ]) ++ [
# Missing `#include <array>`
./tests-missing-includes.patch
# gtest no longer supports c++14. Use c++17.
./tests-cpp-version.patch
];
buildFlags = [
pkgs/by-name/sg/sgx-azure-dcap-client/tests-cpp-version.patch
+39
View File
@@ -0,0 +1,39 @@
diff --git a/src/Linux/CMakeLists.txt b/src/Linux/CMakeLists.txt
index 8567253..0137a7a 100644
--- a/src/Linux/CMakeLists.txt
+++ b/src/Linux/CMakeLists.txt
@@ -13,8 +13,8 @@ endif(__SERVICE_VM__)
find_package(OpenSSL REQUIRED)
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
# Link runTests with what we want to test and the GTest and pthread library
add_executable(dcap_provider_utests ../UnitTest/test_local_cache.cpp ../UnitTest/test_quote_prov.cpp ../UnitTest/main.cpp ../Linux/local_cache.cpp)
diff --git a/src/Linux/Makefile.in b/src/Linux/Makefile.in
index 58a1c77..1ce6431 100644
--- a/src/Linux/Makefile.in
+++ b/src/Linux/Makefile.in
@@ -8,15 +8,15 @@ DEBUG ?= 0
SERVICE_VM ?= 0
ifeq ($(DEBUG), 1)
ifeq ($(SERVICE_VM), 1)
- CFLAGS = -fPIC -std=c++14 -g -Wall -I /usr/local/include/gtest/ -Werror $(INCLUDES) -D__LINUX__ -D__SERVICE_VM__ -Wno-unknown-pragmas -pthread
+ CFLAGS = -fPIC -std=c++17 -g -Wall -I /usr/local/include/gtest/ -Werror $(INCLUDES) -D__LINUX__ -D__SERVICE_VM__ -Wno-unknown-pragmas -pthread
else
- CFLAGS = -fPIC -std=c++14 -g -Wall -I /usr/local/include/gtest/ -Werror $(INCLUDES) -D__LINUX__ -Wno-unknown-pragmas -pthread
+ CFLAGS = -fPIC -std=c++17 -g -Wall -I /usr/local/include/gtest/ -Werror $(INCLUDES) -D__LINUX__ -Wno-unknown-pragmas -pthread
endif
else
ifeq ($(SERVICE_VM), 1)
- CFLAGS = -fPIC -std=c++14 -Wall -I /usr/local/include/gtest/ -Werror $(INCLUDES) -D__LINUX__ -D__SERVICE_VM__ -Wno-unknown-pragmas -pthread
+ CFLAGS = -fPIC -std=c++17 -Wall -I /usr/local/include/gtest/ -Werror $(INCLUDES) -D__LINUX__ -D__SERVICE_VM__ -Wno-unknown-pragmas -pthread
else
- CFLAGS = -fPIC -std=c++14 -Wall -I /usr/local/include/gtest/ -Werror $(INCLUDES) -D__LINUX__ -Wno-unknown-pragmas -pthread
+ CFLAGS = -fPIC -std=c++17 -Wall -I /usr/local/include/gtest/ -Werror $(INCLUDES) -D__LINUX__ -Wno-unknown-pragmas -pthread
endif
endif