From a70d6761f70cc04782fa3ffd4f23d9054548f4b4 Mon Sep 17 00:00:00 2001 From: Jerome Soumagne Date: Tue, 27 Oct 2026 16:34:41 -0500 Subject: [PATCH] DAOS-19867 build: remove isa-l from cart SConscript Move isa-l header inclusion to source files Skip-stack-optimization: true Signed-off-by: Jerome Soumagne --- src/cart/SConscript | 3 --- src/object/cli_ec.c | 2 ++ src/object/obj_ec.h | 3 +-- src/object/srv_ec_aggregate.c | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cart/SConscript b/src/cart/SConscript index a1300564c31..7b27fc8c24a 100644 --- a/src/cart/SConscript +++ b/src/cart/SConscript @@ -67,9 +67,6 @@ def scons(): # Mercury headers are needed for mercury boost headers inclusion env.require('mercury', headers_only=True) - # Needed in order to include src/object/obj_rpc.h - env.require('isal', headers_only=True) - denv = env.Clone(LIBS=[]) denv.AppendUnique(LIBS=['gurt']) diff --git a/src/object/cli_ec.c b/src/object/cli_ec.c index e11bc9e54e8..8d18c1318be 100644 --- a/src/object/cli_ec.c +++ b/src/object/cli_ec.c @@ -17,6 +17,8 @@ #include "obj_rpc.h" #include "obj_internal.h" +#include + #define EC_DEBUG 0 #define EC_REASB_TRACE 0 diff --git a/src/object/obj_ec.h b/src/object/obj_ec.h index 858af55517b..e73c33de161 100644 --- a/src/object/obj_ec.h +++ b/src/object/obj_ec.h @@ -1,5 +1,6 @@ /** * (C) Copyright 2019-2024 Intel Corporation. + * (C) Copyright 2026 Hewlett Packard Enterprise Development LP * * SPDX-License-Identifier: BSD-2-Clause-Patent */ @@ -11,8 +12,6 @@ #include #include -#include - /** MAX number of data cells */ #define OBJ_EC_MAX_K (64) /** MAX number of parity cells */ diff --git a/src/object/srv_ec_aggregate.c b/src/object/srv_ec_aggregate.c index f4760617d08..ba2b48ef01d 100644 --- a/src/object/srv_ec_aggregate.c +++ b/src/object/srv_ec_aggregate.c @@ -59,6 +59,8 @@ #include "obj_ec.h" #include "srv_internal.h" +#include + #define EC_AGG_ITERATION_MAX 1024 #define EC_AGG_PROCESS_CREDITS 128 #define EC_AGG_FILTER_CREDITS 1