From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1215443CE7 for ; Mon, 18 Mar 2024 16:39:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA0B640289; Mon, 18 Mar 2024 16:39:32 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 5ECE04027F for ; Mon, 18 Mar 2024 16:39:31 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-414612cfd82so1894485e9.2 for ; Mon, 18 Mar 2024 08:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710776371; x=1711381171; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BUyv8+zIPJGlDJWI+PWYoWE+Eu1OaB6fAE9ESyI09cM=; b=lXMRu6jHio9IAImCXwHIkFJ6uayT0RqIWABcU3f75gmMR2UqFllHZczb4Ybet+/hNy pGAG/N6ad4a25XdsxPq2B4VTh3/tCQ1/f+JDy5/LH9cho4lXQVJFFtJDdnABVJEFnRBE 6N+DdSbfpZhiiucfJYNJoSniMjayUAFaTx8y3dV6rcYX1cJfGfSr7I8CWz9gLkk6SBIs 7Hsc8pF+OOvn5J98yWPyB9vEFlf9HdsFK4xxwkGo42vktlOPM+wrINRsn7PBOsjp0L+z io47n/AfshKulhL3E9FnKOgSf8UEIGq65+80LZCEu+xe8ZZXCO5erLuCOZYvGXzgewLv eltg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710776371; x=1711381171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BUyv8+zIPJGlDJWI+PWYoWE+Eu1OaB6fAE9ESyI09cM=; b=l5hpJe2A05ISKHqxhTlDUTtEHkANSgKj9jX73ZbA/JB7sTHOWmxuV9vTcU106JwHoK 0WARQc4OPma7XCrnKOxPCt3pHgl//xSmY8S3TYGDfZqAaQnAUXGRghC8097RYto41qT6 Op722trnWFd5Pf8ctqKpFDeUMWxSA9ufDO56R0tW06mgGOe721ShWxqUN/pa+wxnF0yF Lr5T6mV+f+97Xo55CDX6X1NTm5ImV/9MBAqG0icyXrBPnsn20SjLLZgYEvlaXXAKVL1W 11/ts/7Yp+AzeDoWd8yZvkY/UlvXDbgOOA4l6DiWAbkTBESWoGM7caixyAvIZWdPsd7y Ol9A== X-Forwarded-Encrypted: i=1; AJvYcCUJycHZSWxzSA3N34vqZzxU0DheDPN+BwdYpC2SKWQGE3sYNzDghEMXI6zkuJ7gHnmhZQJjBUQ6snMtrkj9+KM= X-Gm-Message-State: AOJu0YzDTL5kwcSs9uarXq2gMN7NCPjlNyV5WuMt6RbyvPSnvOSrK7zB WQTJvIXK8q26UW81a0TLm2xmP3DcBaVncwK3PybjN1+ueiWdb3m+ X-Google-Smtp-Source: AGHT+IF2xsfLrwRSrypxyjrSnYLPnMvDdWJQEpltOW97WiayGiINF2n4glfjlTg8SdbB2VQUsOeb0A== X-Received: by 2002:a05:600c:1550:b0:414:413:538d with SMTP id f16-20020a05600c155000b004140413538dmr6497961wmg.0.1710776370690; Mon, 18 Mar 2024 08:39:30 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id s9-20020a05600c45c900b00413e79344b7sm15231341wmo.19.2024.03.18.08.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 08:39:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Robin Jarry Cc: David Marchand , dpdk stable Subject: patch 'build: pass cflags in subproject' has been queued to stable release 22.11.5 Date: Mon, 18 Mar 2024 15:38:51 +0000 Message-Id: <20240318153919.3407921-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-61-luca.boccassi@gmail.com> References: <20240314000957.2810803-61-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/20/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a05a096f1d97dff922fe0b97b7430e14c6ec327f Thanks. Luca Boccassi --- >From a05a096f1d97dff922fe0b97b7430e14c6ec327f Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Fri, 8 Mar 2024 12:58:40 +0100 Subject: [PATCH] build: pass cflags in subproject [ upstream commit 3f9aa55632bd272981471516608a7eaf543bea37 ] When DPDK is used as a subproject, include the required compile arguments so that the parent project is also built with the appropriate cflags (most importantly -march). Use the same cflags as pkg-config. Fixes: f93a605f2d6e ("build: add definitions for use as Meson subproject") Signed-off-by: Robin Jarry Reviewed-by: David Marchand --- buildtools/subproject/meson.build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/buildtools/subproject/meson.build b/buildtools/subproject/meson.build index 322e01c029..203c5d36c6 100644 --- a/buildtools/subproject/meson.build +++ b/buildtools/subproject/meson.build @@ -2,10 +2,15 @@ # Copyright(c) 2022 Intel Corporation message('DPDK subproject linking: ' + get_option('default_library')) +subproject_cflags = ['-include', 'rte_config.h'] + machine_args +if is_freebsd + subproject_cflags += ['-D__BSD_VISIBLE'] +endif if get_option('default_library') == 'static' dpdk_dep = declare_dependency( version: meson.project_version(), dependencies: dpdk_static_lib_deps, + compile_args: subproject_cflags, # static library deps in DPDK build don't include "link_with" parameters, # so explicitly link-in both libs and drivers link_whole: dpdk_static_libraries + dpdk_drivers, @@ -13,6 +18,7 @@ if get_option('default_library') == 'static' else dpdk_dep = declare_dependency( version: meson.project_version(), + compile_args: subproject_cflags, # shared library deps include all necessary linking parameters dependencies: dpdk_shared_lib_deps) endif -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-18 12:58:39.320431842 +0000 +++ 0001-build-pass-cflags-in-subproject.patch 2024-03-18 12:58:39.083343897 +0000 @@ -1 +1 @@ -From 3f9aa55632bd272981471516608a7eaf543bea37 Mon Sep 17 00:00:00 2001 +From a05a096f1d97dff922fe0b97b7430e14c6ec327f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3f9aa55632bd272981471516608a7eaf543bea37 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org