From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <dev-bounces@dpdk.org> Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1B226A057C; Thu, 26 Mar 2020 10:20:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D770E4C93; Thu, 26 Mar 2020 10:20:48 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id E64103B5 for <dev@dpdk.org>; Thu, 26 Mar 2020 10:20:47 +0100 (CET) IronPort-SDR: lLT8DkZoBh/aI+zOy36z/oYHXPq3OxMTNySYZfheO7AWupCTUYZC7zLAPFk0se8jXD9BEvE1kJ TzE35r6Z7P4g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2020 02:20:44 -0700 IronPort-SDR: loyFk7gmLSPGQ0ydXohjc0NpDUO9J7z2ZD+Rn6Sr+kZl8NBANWJt18jDeELTAYPNVptym1v1fM Vib4iSwJldTA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,307,1580803200"; d="scan'208";a="393918964" Received: from ultraviolet.igk.intel.com (HELO localhost.localdomain) ([10.102.17.137]) by orsmga004.jf.intel.com with ESMTP; 26 Mar 2020 02:20:42 -0700 From: Darek Stojaczyk <dariusz.stojaczyk@intel.com> To: dev@dpdk.org Cc: Bruce Richardson <bruce.richardson@intel.com>, Darek Stojaczyk <dariusz.stojaczyk@intel.com> Date: Thu, 26 Mar 2020 10:22:59 +0100 Message-Id: <20200326092259.33957-1-dariusz.stojaczyk@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] build: don't parse build configs of explicitly disabled drivers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> Even when a PMD was disabled with meson's disable_drivers option its config file was still being parsed. Some of the PMD configs attempt to find a library they depend on and parse its header files with certain assumptions. If the library is found, but it's simply too old to contain the necessary header files, the meson build fails and it can only be fixed by either updating that library, or expanding the meson script for the faulty PMD. While the latter should be still done for the sake of DPDK quality, an intermediate solution would be to skip building the faulty PMD - there's a chance we don't need it. That's what this patch allows. Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> --- drivers/meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 5502bf9924..a13c62a3b0 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -60,9 +60,6 @@ foreach class:dpdk_driver_classes ext_deps = [] pkgconfig_extra_libs = [] - # pull in driver directory which should assign to each of the above - subdir(drv_path) - # skip disabled drivers. For meson 0.49 change this to use # "in" keyword foreach disable_path: disabled_drivers @@ -71,6 +68,12 @@ foreach class:dpdk_driver_classes reason = 'Explicitly disabled via build config' endif endforeach + + if build + # pull in driver directory which should update all the local variables + subdir(drv_path) + endif + if build # get dependency objs from strings shared_deps = ext_deps -- 2.17.1