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 12035455AD for ; Mon, 15 Jul 2024 17:27:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CA87406B4; Mon, 15 Jul 2024 17:27:13 +0200 (CEST) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by mails.dpdk.org (Postfix) with ESMTP id 91D37402B0 for ; Mon, 15 Jul 2024 17:27:11 +0200 (CEST) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-52ea7d2a039so4611241e87.3 for ; Mon, 15 Jul 2024 08:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057231; x=1721662031; 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=6uBxdJAg34goxbBA6tMcThfHNpbWBY6WxoLy09rroik=; b=UDYhQeLbHxPIO+GC5UzaNFwRTBMK/lRM9LuLMeGlYM/VgU7UvAI1makwHSloHxenkZ eGzXCJRkmNI23AwqKbgU1fIF4I80UPlHeQ69Bbcdzj8pxPx2+Q3Bgm0UoMgG5onOm+VS uEF5QIiOCquRDcRxvYQxMlA2ZOLROnk3lfMkz4behBjiQvYrWo1NB6hy9kthemJ9/cIg 9EwzhnsXbrABjALIa03w1BOmbfpBP2jON8mm9IDf9AjnsPiA95PzZUJYdVIQ1rZvJicz rTGMmcot0Am8ucE1EJ9yeoxAQLhVdgAjgGzCRo/HVv9zhJWXiJBUY4PjVE9Wk8Ftg1lI c4RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057231; x=1721662031; 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=6uBxdJAg34goxbBA6tMcThfHNpbWBY6WxoLy09rroik=; b=kOqUl+jmvZEPatfOoSKFRXRlmGdfjEDtItQAT7oZu09FXVB8EDRf3Ll7sGEksKYQWF nm/NE0g0pLcVzdMX6lW6NL3rxonYpmuTuQef09NKWfn4gGW9OBldQqWeytCboesSWk8R dsaGvH/gf63OaAsFSjufwY0Hxm7+ntb8Dia6k3BDgfGHMS9Z98t0ePMpNqg5+SwmYys+ 252LMAY4wTwU2P3sBiEK8LlGFgDmNnnQaO275NxY5CDKrzf9jzZSRUxYrBva7Z3ebwXk RBknMfkWnSBt5spKoinDuBZIEvd+baAQ0jhhXMYl7HaWJjkbHvaVOjp7gF+mhIhVPZ/I OmPA== X-Forwarded-Encrypted: i=1; AJvYcCXJqoJCmjFVg2D7XtQCX7MWH8jbKyoIhtzaGAWyvEQJhGLdQVab1+qKiXSEs+NWYXdbrFzW7y36gvowD+qsiLI= X-Gm-Message-State: AOJu0Yz3HEHHriwyG968qK2Aj7ldHQ/jQ7wtnAlgBKrbe0dyY8lUDOz8 Q+JwO6aIXn4k+zbe4MTRrN1QCiU4qTZzK5x7KhnHfV3PACdPoK9h X-Google-Smtp-Source: AGHT+IFWqq0EvgldQlpvLe7r+10weyJZGhNKsActKj9PiUIp0wihE3WpUv3+nLXYWW8qv1DqiuWQJQ== X-Received: by 2002:ac2:53ac:0:b0:52d:73b:db14 with SMTP id 2adb3069b0e04-52eb99a2c92mr10811588e87.35.1721057230753; Mon, 15 Jul 2024 08:27:10 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5e827efsm92488285e9.16.2024.07.15.08.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:27:10 -0700 (PDT) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: Dmitry Kozlyuk , Bruce Richardson , dpdk stable Subject: patch 'build: use builtin helper for python dependencies' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:25:40 +0100 Message-Id: <20240715152704.2229503-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-1-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.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 07/17/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/fcfe871790d34c1a3b4eaa5d3d3eed732b79def0 Thanks. Luca Boccassi --- >From fcfe871790d34c1a3b4eaa5d3d3eed732b79def0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 23 Jun 2024 13:30:23 +0100 Subject: [PATCH] build: use builtin helper for python dependencies [ upstream commit 9ab7baa5c14b1ba928c09bda4734827d6d367d6b ] We now require Meson 0.53 or later, so we can use this feature introduced in 0.51. This also fixes a build failure on SUSE Leap 15.6 where the manual check fails to detect the pyelftools module. Signed-off-by: Luca Boccassi Acked-by: Dmitry Kozlyuk Acked-by: Bruce Richardson --- buildtools/meson.build | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/buildtools/meson.build b/buildtools/meson.build index e1c600e40f..c4f6fe9271 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -6,7 +6,11 @@ check_symbols = find_program('check-symbols.sh') ldflags_ibverbs_static = find_program('options-ibverbs-static.sh') objdump = find_program('objdump', 'llvm-objdump') -python3 = import('python').find_installation(required: false) +python3_required_modules = [] +if host_machine.system() != 'windows' + python3_required_modules = ['elftools'] +endif +python3 = import('python').find_installation('python3', required: false, modules: python3_required_modules) if python3.found() py3 = [python3] else @@ -39,16 +43,3 @@ else pmdinfogen += 'elf' endif -# TODO: starting from Meson 0.51.0 use -# python3 = import('python').find_installation('python', -# modules : python3_required_modules) -python3_required_modules = [] -if host_machine.system() != 'windows' - python3_required_modules = ['elftools'] -endif -foreach module : python3_required_modules - script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)' - if run_command(py3, '-c', script.format(module), check: false).returncode() != 0 - error('missing python module: @0@'.format(module)) - endif -endforeach -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:34.877654052 +0100 +++ 0002-build-use-builtin-helper-for-python-dependencies.patch 2024-07-15 16:19:34.432203559 +0100 @@ -1 +1 @@ -From 9ab7baa5c14b1ba928c09bda4734827d6d367d6b Mon Sep 17 00:00:00 2001 +From fcfe871790d34c1a3b4eaa5d3d3eed732b79def0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9ab7baa5c14b1ba928c09bda4734827d6d367d6b ] + @@ -11,2 +12,0 @@ -Cc: stable@dpdk.org - @@ -21 +21 @@ -index 72447b60a0..3adf34e1a8 100644 +index e1c600e40f..c4f6fe9271 100644 @@ -24,2 +24 @@ -@@ -5,7 +5,11 @@ pkgconf = find_program('pkg-config', 'pkgconf', required: false) - check_symbols = find_program('check-symbols.sh') +@@ -6,7 +6,11 @@ check_symbols = find_program('check-symbols.sh') @@ -26,0 +26 @@ + objdump = find_program('objdump', 'llvm-objdump') @@ -37 +37 @@ -@@ -45,16 +49,3 @@ else +@@ -39,16 +43,3 @@ else