From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E9469A04DD for ; Wed, 28 Oct 2020 11:51:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D4E5BC9FE; Wed, 28 Oct 2020 11:51:40 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by dpdk.org (Postfix) with ESMTP id 2B4AAC9F0 for ; Wed, 28 Oct 2020 11:51:39 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id k21so2999531wmi.1 for ; Wed, 28 Oct 2020 03:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yPjp/A7mXk90fxepVrZUNYlU1ZSxMJA/xog/Ctoa4WI=; b=dcIcXYKQipADTWZDcClptTpsfN2Oy+hTUa34PufIGDoF33BnxAGY2YVbE8Am3tQbRH 0Q5IQs3mbvqDjuWahZ8+GPgMLcFutiu6/hq4WyqtUDPIq36G5ZVvpg/A5/vb6qNG5Sjk kkGq2Xnd+ZrG9HciNm73cw8DXwrAX2Cb8nGgRuxyaYl5kZJAeJeSPV3NcpgQL6mZz3i9 9QAO16AWCqYLnja/XVl2MhRxKLQhLoxQJh8VR2CAHMsHQGJheRjQOORMZM1daWcY7EIn 6ztQKZEKdEu/6R6r7eSI0dyKjVYANZJMuKyb9RkS8VQuvbz2NvZjhZm+qfRU/J7ynieN mzzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yPjp/A7mXk90fxepVrZUNYlU1ZSxMJA/xog/Ctoa4WI=; b=jo3MHHLEz89nIYklJVYobrpdnP969q/X+prAIjsvbDCsmG6FluxWo61jgOUZLNmyVd xHvuUMD1DibaaEbGVCl84bgZCUayha7gd93ZgcraA1a4fHXov2UMe7cPO6JcGMEVtAou BBFY77H3TRW68kDkOiVqwimu4TD0O7rey7eb/hZGi6K/UtfUQf1WvNV+AmI7LNXwPDv3 7IJdboM4aRS6S/6bRUOhyXN0JBPxeWRYEENravTenVCr729Sw5yTAor6wXown4WVYh+p PF3IIAggRcodz9eR/4xL5cGM5h1uLKEipKTh2StNRAk0sDL0zMXLjqLeJRY+hJDC8kX4 /vhQ== X-Gm-Message-State: AOAM532rG14x9qvhF4OBway8+f9/4k7FkeC74RrlOoUDTYR+/+EJo/Gx uvFPHN/Gs1u967hAAkvD8R0= X-Google-Smtp-Source: ABdhPJxeGcyKfgcUtpWXhUYToC0iMfiOnwxK1veAdEoVZKp9O4jn/MUsc4c/VkofqK1egsCqyom6gQ== X-Received: by 2002:a1c:b6d4:: with SMTP id g203mr7259337wmf.132.1603882297933; Wed, 28 Oct 2020 03:51:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j5sm6213217wrx.88.2020.10.28.03.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: John McNamara , dpdk stable Date: Wed, 28 Oct 2020 10:44:23 +0000 Message-Id: <20201028104606.3504127-104-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix formatting of notes in meson guide' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From b8ec7ffe965b43ce7c4b84185605d21bbb65aae1 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 3 Sep 2020 15:00:33 +0100 Subject: [PATCH] doc: fix formatting of notes in meson guide [ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ] The "note" callouts in the chapter describing the meson build were incorrectly formatted, so adjust to use the correct markdown syntax. Fixes: 9c3adc289c5e ("doc: add instructions on build using meson") Signed-off-by: Bruce Richardson Acked-by: John McNamara --- doc/build-sdk-meson.txt | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt index 3a3682cd44..f3ff9289cb 100644 --- a/doc/build-sdk-meson.txt +++ b/doc/build-sdk-meson.txt @@ -94,14 +94,17 @@ Examples of setting the same options using meson configure:: meson configure -Dmax_lcores=8 -NOTE: once meson has been run to configure a build in a directory, it -cannot be run again on the same directory. Instead ``meson configure`` -should be used to change the build settings within the directory, and when -``ninja`` is called to do the build itself, it will trigger the necessary -re-scan from meson. +.. note:: -NOTE: machine=default uses a config that works on all supported architectures -regardless of the capabilities of the machine where the build is happening. + once meson has been run to configure a build in a directory, it + cannot be run again on the same directory. Instead ``meson configure`` + should be used to change the build settings within the directory, and when + ``ninja`` is called to do the build itself, it will trigger the necessary + re-scan from meson. + +.. note:: + machine=default uses a config that works on all supported architectures + regardless of the capabilities of the machine where the build is happening. As well as those settings taken from ``meson configure``, other options such as the compiler to use can be passed via environment variables. For @@ -109,9 +112,11 @@ example:: CC=clang meson clang-build -NOTE: for more comprehensive overriding of compilers or other environment -settings, the tools for cross-compilation may be considered. However, for -basic overriding of the compiler etc., the above form works as expected. +.. note:: + + for more comprehensive overriding of compilers or other environment + settings, the tools for cross-compilation may be considered. However, for + basic overriding of the compiler etc., the above form works as expected. Performing the Build -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.005957276 +0000 +++ 0104-doc-fix-formatting-of-notes-in-meson-guide.patch 2020-10-28 10:35:11.656832261 +0000 @@ -1,27 +1,28 @@ -From 1509ef9350671ee13381ce8e3c1741c2effc28b1 Mon Sep 17 00:00:00 2001 +From b8ec7ffe965b43ce7c4b84185605d21bbb65aae1 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 3 Sep 2020 15:00:33 +0100 Subject: [PATCH] doc: fix formatting of notes in meson guide +[ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ] + The "note" callouts in the chapter describing the meson build were incorrectly formatted, so adjust to use the correct markdown syntax. Fixes: 9c3adc289c5e ("doc: add instructions on build using meson") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: John McNamara --- - doc/guides/prog_guide/build-sdk-meson.rst | 25 ++++++++++++++--------- + doc/build-sdk-meson.txt | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) -diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst -index 44d1cafdf0..d621bea565 100644 ---- a/doc/guides/prog_guide/build-sdk-meson.rst -+++ b/doc/guides/prog_guide/build-sdk-meson.rst -@@ -102,14 +102,17 @@ Examples of setting some of the same options using meson configure:: +diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt +index 3a3682cd44..f3ff9289cb 100644 +--- a/doc/build-sdk-meson.txt ++++ b/doc/build-sdk-meson.txt +@@ -94,14 +94,17 @@ Examples of setting the same options using meson configure:: - meson configure -Denable_trace_fp=true + meson configure -Dmax_lcores=8 -NOTE: once meson has been run to configure a build in a directory, it -cannot be run again on the same directory. Instead ``meson configure`` @@ -44,7 +45,7 @@ As well as those settings taken from ``meson configure``, other options such as the compiler to use can be passed via environment variables. For -@@ -117,9 +120,11 @@ example:: +@@ -109,9 +112,11 @@ example:: CC=clang meson clang-build