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 CF19DA0C47 for ; Tue, 15 Jun 2021 14:22:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 984D640140; Tue, 15 Jun 2021 14:22:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id 3568840140 for ; Tue, 15 Jun 2021 14:22:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623759731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MG4US4J4Vdxjvfy9Ri5hz6stZHvtlvOAKxVJMslFTtQ=; b=ZQTLYwWy871aZ//zyoUdNGzZ2LadIFHdErs9Xu8GmIp8Hw4PvTyMg1WodGmN+VmF3WU271 kzVFPbVe9HEcfaNrQnJNegGJZ/pQbHeJktfh1OqIoPrYxXOPk5XsTcWQUjpFBVVEhbtfWX GF/KR80U1si212XXQ1tn51adclN0pKQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-519-xJ00HHbFMD-G4t6alcLrXA-1; Tue, 15 Jun 2021 08:22:08 -0400 X-MC-Unique: xJ00HHbFMD-G4t6alcLrXA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7A946800D62; Tue, 15 Jun 2021 12:22:06 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.193.154]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6335718AD4; Tue, 15 Jun 2021 12:22:04 +0000 (UTC) From: David Marchand To: stable@dpdk.org Cc: xuemingl@nvidia.com, Bruce Richardson , Robin Jarry , Luca Boccassi Date: Tue, 15 Jun 2021 14:21:53 +0200 Message-Id: <20210615122153.24002-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] [PATCH 20.11] build: fix drivers selection without Python 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" [ upstream commit 627c5b41bb14a1afbd1489b0fc4b8224532a823d ] The list of disabled drivers is built by calling list-dir-globs.py. But if no Python interpreter is installed, no error is reported and no driver is disabled. Example on a minimal FreeBSD VM: dpdk@freebsd:~/dpdk $ meson setup build -Ddisable_drivers=net/* ... Message: =============== Drivers Enabled =============== common: cpt, iavf, octeontx, octeontx2, sfc_efx, qat, bus: ifpga, pci, vdev, mempool: bucket, octeontx, octeontx2, ring, stack, net: ark, atlantic, bond, bnxt, cxgbe, e1000, ena, enic, failsafe, fm10k, i40e, hinic, iavf, ice, igc, ixgbe, liquidio, null, octeontx, octeontx2, pcap, qede, ring, sfc, thunderx, txgbe, virtio, vmxnet3, ... dpdk@freebsd:~/dpdk $ cd drivers/ dpdk@freebsd:~/dpdk/drivers $ ~/dpdk/buildtools/list-dir-globs.py net/* env: python3: No such file or directory Rely on meson internal interpreter. Check return code when calling this script. Fixes: ab9407c3addd ("build: allow using wildcards to disable drivers") Signed-off-by: David Marchand --- buildtools/meson.build | 2 +- drivers/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/meson.build b/buildtools/meson.build index 04808dabc1..36161afe48 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -3,7 +3,6 @@ pkgconf = find_program('pkg-config', 'pkgconf', required: false) pmdinfo = find_program('gen-pmdinfo-cfile.sh') -list_dir_globs = find_program('list-dir-globs.py') 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') @@ -15,5 +14,6 @@ if python3.found() else py3 = ['meson', 'runpython'] endif +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/drivers/meson.build b/drivers/meson.build index f9febc579e..f7db4329bf 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -19,7 +19,7 @@ subdirs = [ ] disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'), - ).stdout().split() + check: true).stdout().split() default_cflags = machine_args default_cflags += ['-DALLOW_EXPERIMENTAL_API'] -- 2.23.0