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 E92F14599D for ; Fri, 20 Sep 2024 14:57:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E349043437; Fri, 20 Sep 2024 14:57:57 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id 5D50E4342A; Fri, 20 Sep 2024 14:57:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837076; x=1758373076; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Afx/cMEHKyBWvM7aD/8BdZfAmRo27Le6KgQfxtD6AHE=; b=gPWV9zhj2yQunFXCD2lMNQSbjntCu68hf4mYOERl46Er6Tnrxa5Ie8lK GerAhDNtBNZUrGlAbf83X1M3RVafI3Z5W79inXQK/EhJyQXwopmFJwvnM g17LAqWWFzCBkCzEiMPq8XAWILZEg/TzdR47ty/Uoby4d2PRHCdCL3RuT R+E1bcq2X/9lRp9nwoZIfkc5wGZ1NYkVPB+LizGdDP3DxAIqkPj3V0rsZ h/ealQFs3J/ssesLJSwkSTF3Mu/LlhoKk//7rVbkuO31WysxTjiCnJ00p YUL7/8aV7DwDcYdCzVygy+ccQShldiTV7Ag2YQ1PMP7hrlJDbxAMScQwY g==; X-CSE-ConnectionGUID: JTRdbDRGRhyvzL4msKAzNA== X-CSE-MsgGUID: kQipLDEMSB+nt2HhhKaWEQ== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991097" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991097" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 05:57:55 -0700 X-CSE-ConnectionGUID: J+qvfOhQScixzS8NvL09AA== X-CSE-MsgGUID: Fu252Bv0Q7qcNZdrL6Gdkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135909" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:57:54 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org Subject: [PATCH 2/5] build: remove version check on compiler links function Date: Fri, 20 Sep 2024 13:57:34 +0100 Message-ID: <20240920125737.1197969-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com> References: <20240920125737.1197969-1-bruce.richardson@intel.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 The "compiler.links()" function meson documentation [1] is a little unclear, in a casual reading implies that the function was new in 0.60 meson release. In fact, it is only enhanced as described in that release, but is present earlier. As such, we can remove the version checks preceeding the calls to links function in our code. [1] https://mesonbuild.com/Reference-manual_returned_compiler.html#compilerlinks Fixes: fd809737cf8c ("common/qat: fix build with incompatible IPsec library") Fixes: fb94d8243894 ("crypto/ipsec_mb: add dependency check for cross build") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- drivers/common/qat/meson.build | 2 +- drivers/crypto/ipsec_mb/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build index 3893b127dd..5a8de16fe0 100644 --- a/drivers/common/qat/meson.build +++ b/drivers/common/qat/meson.build @@ -43,7 +43,7 @@ else IMB_required_ver = '1.4.0' IMB_header = '#include' libipsecmb = cc.find_library('IPSec_MB', required: false) - if libipsecmb.found() and meson.version().version_compare('>=0.60') and cc.links( + if libipsecmb.found() and cc.links( 'int main(void) {return 0;}', dependencies: libipsecmb) # version comes with quotes, so we split based on " and take the middle imb_ver = cc.get_define('IMB_VERSION_STR', diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build index 87bf965554..81631d3050 100644 --- a/drivers/crypto/ipsec_mb/meson.build +++ b/drivers/crypto/ipsec_mb/meson.build @@ -17,7 +17,7 @@ if not lib.found() build = false reason = 'missing dependency, "libIPSec_MB"' # if the lib is found, check it's the right format -elif meson.version().version_compare('>=0.60') and not cc.links( +elif not cc.links( 'int main(void) {return 0;}', dependencies: lib) build = false reason = 'incompatible dependency, "libIPSec_MB"' -- 2.43.0