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 5E07EA0C4C for ; Mon, 12 Jul 2021 15:15:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 586EC40685; Mon, 12 Jul 2021 15:15:49 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 08BCB4069E for ; Mon, 12 Jul 2021 15:15:47 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id m2so14540058wrq.2 for ; Mon, 12 Jul 2021 06:15:47 -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=z1H7F9AbbrWvVbxMc9HEo2Z2H2Jm/tX23tsaGxNVgfs=; b=IFZMwR+HotallFJsrYwwPmvx6HflrEeWGIv0tH9g1L9nWsmmfF43LcnGpgE6Y+qhIB K0e3j8VGVP9LfSt1ZzOyN+NoFwMWWD8Eh6QZ+rsmY2bse+Ad1/LDYpU2f0xSH9XYEp/7 7Cs0FCq6/ZRbyBPm3mklX4Hs5K05Y3ScmDtw8ec2t+q0rD89sKVVhVN3GXdv1ZBN0vjY V4cxsIlCQja8j+ez+grZ7DkXr3WZCzh41eaQXPZlC5QEUQLZkfr0QgXNvMXmMXzPQzB2 Pf8pV++2rfiGAyyKuzJXA8zueF1aTVTDP/y+ZmCg1CGK2WZTnJ4N5vc4uN8LIDEa5tPb 5Ckg== 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=z1H7F9AbbrWvVbxMc9HEo2Z2H2Jm/tX23tsaGxNVgfs=; b=bASVKTiMSsKVu1+6TXSYuzS4ehrtM/d+V9R/I1Yhe4nIkmW/C/r+NfWuaNmIpsjbib t3uflESSEmaD9n3E8ZqgypmaMXtai0VOMEilq1QTNSpLOSjeopMmdVuazCgYg9p62h9L /L1QIoWbiqpluqvDHN0gjXBVAcDy0Ktb8Nk3odc3wIt8I7wYJCIjXr6d2VIVIqUIWNmz 37nn02s5UeFbZWvRQNRA+AafS4BVSC+0V7cM82JiAvA6Ak1EPgQozfRPwPy0YJREWLcD VZMzxn7Rwow0lLlajDmQHX/E4McSzcaZH6hw99SY/FUoORsBRdW6q2TzzQO10rv+/si/ w8EA== X-Gm-Message-State: AOAM5331td97zYdnPvYegKAyy5EdyZgnmqmB3GI3NVEcfqXpFdIxUMGl AtR4TrYssDjwkZM6YeBk7DQ= X-Google-Smtp-Source: ABdhPJxSenPAqDa+YRBpTyINa4LcdkSaBMe02mKTAPEnL+0+KZbdVuIJc/0WBp91bu+ALqQikeYNTw== X-Received: by 2002:adf:f907:: with SMTP id b7mr58681631wrr.357.1626095746785; Mon, 12 Jul 2021 06:15:46 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id z11sm14577636wru.65.2021.07.12.06.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:15:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Dmitry Kozlyuk Cc: Rob Scheepens , Luca Boccassi , Bruce Richardson , Thomas Monjalon , dpdk stable Date: Mon, 12 Jul 2021 14:05:43 +0100 Message-Id: <20210712130551.2462159-108-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix build on Windows with Meson 0.58' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. 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/6cbeec965743bc4ae9906f78ea2d58e85dba0e98 Thanks. Luca Boccassi --- >From 6cbeec965743bc4ae9906f78ea2d58e85dba0e98 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Wed, 30 Jun 2021 19:22:35 +0300 Subject: [PATCH] doc: fix build on Windows with Meson 0.58 [ upstream commit e8c90926bddec034bfdb753044c001aa90e4d1f8 ] The `doc` target used `echo` as its command. On Windows, `echo` is always a shell built-in, there is no binary. Starting from meson 0.58, `run_target()` always searches for command executable and no longer accepts `echo` as such on Windows. Replace plain `echo` with a Python one-liner. Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson") Reported-by: Rob Scheepens Signed-off-by: Dmitry Kozlyuk Acked-by: Luca Boccassi Acked-by: Bruce Richardson Acked-by: Thomas Monjalon --- buildtools/meson.build | 2 +- doc/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/meson.build b/buildtools/meson.build index 36161afe48..cfad51f52a 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -7,13 +7,13 @@ check_symbols = find_program('check-symbols.sh') ldflags_ibverbs_static = find_program('options-ibverbs-static.sh') binutils_avx512_check = find_program('binutils-avx512-check.sh') -# set up map-to-win script using python, either built-in or external python3 = import('python').find_installation(required: false) if python3.found() py3 = [python3] else py3 = ['meson', 'runpython'] endif +echo = py3 + ['-c', 'import sys; print(*sys.argv[1:])'] list_dir_globs = py3 + files('list-dir-globs.py') map_to_win_cmd = py3 + files('map_to_win.py') sphinx_wrapper = py3 + files('call-sphinx-build.py') diff --git a/doc/meson.build b/doc/meson.build index c5410d85d6..d6cf85a900 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -11,5 +11,5 @@ if doc_targets.length() == 0 else message = 'Building docs:' endif -run_target('doc', command: ['echo', message, doc_target_names], +run_target('doc', command: [echo, message, doc_target_names], depends: doc_targets) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:42.219484515 +0100 +++ 0108-doc-fix-build-on-Windows-with-Meson-0.58.patch 2021-07-12 13:41:36.914131443 +0100 @@ -1 +1 @@ -From e8c90926bddec034bfdb753044c001aa90e4d1f8 Mon Sep 17 00:00:00 2001 +From 6cbeec965743bc4ae9906f78ea2d58e85dba0e98 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e8c90926bddec034bfdb753044c001aa90e4d1f8 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 0f24b15297..bd460e3e00 100644 +index 36161afe48..cfad51f52a 100644 @@ -29 +30 @@ -@@ -6,13 +6,13 @@ check_symbols = find_program('check-symbols.sh') +@@ -7,13 +7,13 @@ check_symbols = find_program('check-symbols.sh') @@ -36 +37 @@ - py3 = [python3] + py3 = [python3] @@ -38 +39 @@ - py3 = ['meson', 'runpython'] + py3 = ['meson', 'runpython'] @@ -45 +46 @@ -index 959606b965..6f74706aa2 100644 +index c5410d85d6..d6cf85a900 100644 @@ -50 +51 @@ - message = 'Building docs:' + message = 'Building docs:' @@ -54 +55 @@ - depends: doc_targets) + depends: doc_targets)