From 33e3555aa63db9ac5ef901fe628912f21d638615 Mon Sep 17 00:00:00 2001 From: zhengxiaoxiaoGitee Date: Fri, 29 Mar 2024 20:18:05 +0800 Subject: [PATCH] add codegen compile marco --- backport-add-codegen-compile-marco.patch | 29 ++++++++++++++++++++++++ secGear.spec | 6 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 backport-add-codegen-compile-marco.patch diff --git a/backport-add-codegen-compile-marco.patch b/backport-add-codegen-compile-marco.patch new file mode 100644 index 0000000..97af32f --- /dev/null +++ b/backport-add-codegen-compile-marco.patch @@ -0,0 +1,29 @@ +From 088eca103708b2d54c4fe46f6dc2da7a21f4f0da Mon Sep 17 00:00:00 2001 +From: houmingyong +Date: Thu, 7 Dec 2023 14:08:36 +0800 +Subject: [PATCH] add codegen compile marco + +Reference:https://gitee.com/openeuler/secGear/commit/088eca103708b2d54c4fe46f6dc2da7a21f4f0da +Conflict:Deleted the PL part from the patch. +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25e6381..8a6f22b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,10 @@ if(${ENCLAVE} STREQUAL "SGX") + set(CC_SGX ON) + endif() + +-add_subdirectory(tools/codegener) ++option(CODEGEN "default off" ON) ++if(CODEGEN) ++ add_subdirectory(tools/codegener) ++endif() + + add_subdirectory(src) + add_subdirectory(component) +-- +2.33.0 diff --git a/secGear.spec b/secGear.spec index d6bcd93..a2f2530 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 45 +Release: 46 Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -82,6 +82,7 @@ Patch69: 0070-sign-tool-add-invalid-param-verify.patch Patch70: 0071-adapt-report-with-request-key.patch Patch71: backport-use-memset-instead-of-explicit_bzero.patch Patch72: backport-memset-no-optimize.patch +Patch73: backport-add-codegen-compile-marco.patch BuildRequires: gcc python automake autoconf libtool BUildRequires: glibc glibc-devel cmake ocaml-dune rpm gcc-c++ compat-openssl11-libs compat-openssl11-devel @@ -213,6 +214,9 @@ popd systemctl restart rsyslog %changelog +* Wed Mar 29 2024 zhengxiaoxiao - 0.1.0-46 +- add codegen compile marco + * Wed Mar 27 2024 zhengxiaoxiao - 0.1.0-45 - Keep the 24.03 branch of the secGear consistent with the 22.03-LTS-SP3 release