From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1294743037;
Fri, 11 Aug 2023 20:25:03 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id CF0D84325F;
Fri, 11 Aug 2023 20:24:52 +0200 (CEST)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 822C040F17
for <dev@dpdk.org>; Fri, 11 Aug 2023 20:24:49 +0200 (CEST)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id BD38F20FCF7F; Fri, 11 Aug 2023 11:24:48 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BD38F20FCF7F
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1691778288;
bh=tFtPwRO1U6JpXiQuWkrmOwTG9wSAqtJWzlOWfFJiZSw=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=CAKbPsaW2ptw6z1dEWma+uIKSpNxq7/uwJagvUz8IrEcWmNlWrlssIXJkSeqzIL5g
vVrJ8gkJLOe77va+FYM+eX4ob/jE9hT9oNZwDk9NlvwKXpg0C0o5esmlWDOd9WArau
syq/mPVNFQ9XD8dtCsRqINejy5LNpvQ7QN4uFIZQ=
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
david.marchand@redhat.com, thomas@monjalon.net,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH v4 2/4] build: determine execution environment at config time
Date: Fri, 11 Aug 2023 11:24:45 -0700
Message-Id: <1691778287-15746-3-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1691778287-15746-1-git-send-email-roretzla@linux.microsoft.com>
References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com>
<1691778287-15746-1-git-send-email-roretzla@linux.microsoft.com>
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Move execution environment determination and definitions to config. The
RTE_EXEC_ENV macros are actually used by libraries built before EAL.
Currently it does not matter that this is determined in lib/eal since
the definitions are consumed before anything is built including libs
built before lib/eal. By moving this logic to config it allows kvargs
and telemetry to be built without EAL.
No functional change intended.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
config/meson.build | 8 ++++++++
lib/eal/meson.build | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index b6c7d48..821a1c3 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -14,6 +14,14 @@ foreach env:supported_exec_envs
set_variable('is_' + env, exec_env == env)
endforeach
+exec_envs = {'freebsd': 0, 'linux': 1, 'windows': 2}
+foreach env, id:exec_envs
+ dpdk_conf.set('RTE_ENV_' + env.to_upper(), id)
+ dpdk_conf.set10('RTE_EXEC_ENV_IS_' + env.to_upper(), (exec_env == env))
+endforeach
+dpdk_conf.set('RTE_EXEC_ENV', exec_envs[exec_env])
+dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
+
# MS linker requires special treatment.
# TODO: use cc.get_linker_id() with Meson >= 0.54
is_ms_compiler = is_windows and (cc.get_id() == 'msvc')
diff --git a/lib/eal/meson.build b/lib/eal/meson.build
index 0fb974c..9942104 100644
--- a/lib/eal/meson.build
+++ b/lib/eal/meson.build
@@ -10,14 +10,6 @@ if not is_windows
subdir('unix')
endif
-exec_envs = {'freebsd': 0, 'linux': 1, 'windows': 2}
-foreach env, id:exec_envs
- dpdk_conf.set('RTE_ENV_' + env.to_upper(), id)
- dpdk_conf.set10('RTE_EXEC_ENV_IS_' + env.to_upper(), (exec_env == env))
-endforeach
-dpdk_conf.set('RTE_EXEC_ENV', exec_envs[exec_env])
-
-dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
subdir(exec_env)
subdir(arch_subdir)
--
1.8.3.1