fix build failed

This commit is contained in:
qsw333 2024-02-25 11:24:07 +08:00
parent d2c3a3bfcc
commit 0377e66f04
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 07c4e80ed24038bf602fb6099b5ffde9583e4aa6 Mon Sep 17 00:00:00 2001
From: qsw333 <wangqingsan@huawei.com>
Date: Sun, 25 Feb 2024 11:21:33 +0800
Subject: [PATCH] fix C++17 build failed
---
psw/ae/aesm_service/source/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/psw/ae/aesm_service/source/CMakeLists.txt b/psw/ae/aesm_service/source/CMakeLists.txt
index a77d53f..adb88be 100644
--- a/psw/ae/aesm_service/source/CMakeLists.txt
+++ b/psw/ae/aesm_service/source/CMakeLists.txt
@@ -66,7 +66,7 @@ endif()
add_definitions("-DOPENSSL_API_COMPAT=10101")
set(CMAKE_CXX_STANDARD_REQUIRED 1)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_SKIP_BUILD_RPATH true)
########## SGX SDK Settings ##########
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: linux-sgx
Version: 2.19
Release: 2
Release: 3
Summary: Intel(R) Software Guard Extensions for Linux* OS
ExclusiveArch: x86_64
License: BSD-3-Clause
@ -31,6 +31,7 @@ Patch2: 0003-add-secure-compilation-options.patch
Patch3: 0004-adapt-openssl-CVE.patch
Patch4: 0005-DCAP-disabling-the-rpatch-option.patch
Patch5: 0006-fix-build-error.patch
Patch6: 0007-fix-C-17-build-failed.patch
BuildRequires: gcc-c++ protobuf-devel libtool ocaml ocaml-ocamlbuild compat-openssl11-devel cmake python curl-devel createrepo_c git nasm
BuildRequires: protobuf-lite-devel protobuf-c-devel boost-devel
@ -868,6 +869,9 @@ if [ -x /opt/intel/sgx-dcap-pccs/startup.sh ]; then /opt/intel/sgx-dcap-pccs/sta
%files -n libsgx-headers -f %{LINUX_INSTALLER_RPM_DIR}/libsgx-headers/build/list-libsgx-headers
%changelog
* Sun Feb 25 2024 wangqingsan<wangqingsan@huawei.com> - 2.19-3
- fix build failed.
* Thu Aug 10 2023 zhoushuiqing <zhoushuiqing2@huawei.com> - 2.19-2
- Keep in sync with the version number of intel-sgx-ssl.