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 162374599D; Fri, 20 Sep 2024 14:58:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2306F4343B; Fri, 20 Sep 2024 14:58:01 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id 384CA43430 for ; Fri, 20 Sep 2024 14:57:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837080; x=1758373080; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ompj9cTybSBa5U5HxWg4HynTDtGB59zWHBRDTm4mdJA=; b=fEyuSkaYrZ+034RaEqNg9BgvFaslzrtWyFTSjhJXA5YCgQFxU/z56yLc 79FACmP3nuM6l6W6WEYk2/yb/si0IPKGy1x17fS0OiePcXbDRnGmQt3aO LZ8DuUnUcWsfLTd/WoCrbVupl4Wxv16RqzZtw1ZfM5IBm2/qAybgKZh7Y IJuXavOfmbE8hISRsD/SpJrB3NPl4ppUMtKLZZM3lQnAKzjQxEDvDSNnY VP25pEsTOiiP1lyOviuV1KTly2Hy80q7WqSYqhCgyLmcPpiUYchxJI028 Wajyn0u5Gs2LQRyyuhRXtpRYAy6KKYj2dEsVSlx33GAr7HgHYWvQ0CRZl Q==; X-CSE-ConnectionGUID: JpHh4CF1RR2hSowsm7VriA== X-CSE-MsgGUID: TP3x4XzoSVWCaE88tzfVNw== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991103" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991103" 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:59 -0700 X-CSE-ConnectionGUID: dJ+VzMXsSKWURhPcui8VEQ== X-CSE-MsgGUID: X7RA/mVpRdGrjtujfLi7FQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135912" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:57:58 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson Subject: [PATCH 3/5] build: remove unnecessary version checks Date: Fri, 20 Sep 2024 13:57:35 +0100 Message-ID: <20240920125737.1197969-4-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: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Since minimum meson version is now 0.57 we can remove all version checks for versions lower than that. Signed-off-by: Bruce Richardson --- config/meson.build | 2 +- doc/api/meson.build | 2 +- drivers/meson.build | 3 --- lib/meson.build | 6 ------ 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/config/meson.build b/config/meson.build index 8c8b019c25..913825b1ca 100644 --- a/config/meson.build +++ b/config/meson.build @@ -97,7 +97,7 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) if not is_windows meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', get_option('libdir'), pmd_subdir_opt) -elif meson.version().version_compare('>=0.55.0') +else # 0.55.0 is required to use external program with add_install_script meson.add_install_script(py3, files('../buildtools/symlink-drivers-solibs.py'), diff --git a/doc/api/meson.build b/doc/api/meson.build index 5b50692df9..404c145672 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -97,6 +97,6 @@ doc_target_names += 'Doxygen_API(Manpage)' # refresh the manpage database on install # if DPDK manpages are installed to a staging directory, not in MANPATH, this has no effect mandb = find_program('mandb', required: false) -if mandb.found() and get_option('enable_docs') and meson.version().version_compare('>=0.55.0') +if mandb.found() and get_option('enable_docs') meson.add_install_script(mandb) endif diff --git a/drivers/meson.build b/drivers/meson.build index 66931d4241..1cb98e9354 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -280,9 +280,6 @@ foreach subpath:subdirs lk_deps += [def_file] lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:drivers\\lib' + lib_name + '.dll.a'] - endif else mingw_map = custom_target(lib_name + '_mingw', command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], diff --git a/lib/meson.build b/lib/meson.build index 162287753f..ce92cb5537 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -276,14 +276,8 @@ foreach l:libraries if is_ms_compiler lk_args = ['/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['/implib:lib\\librte_' + l + '.dll.a'] - endif else lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:lib\\librte_' + l + '.dll.a'] - endif endif else if is_windows -- 2.43.0