From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id A64988DB3 for ; Fri, 27 Apr 2018 15:49:46 +0200 (CEST) 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/DHE-RSA-AES256-GCM-SHA384; 27 Apr 2018 06:49:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,335,1520924400"; d="scan'208";a="194881377" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by orsmga004.jf.intel.com with ESMTP; 27 Apr 2018 06:49:44 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: hemant.agrawal@nxp.com, bluca@debian.org, Bruce Richardson Date: Fri, 27 Apr 2018 14:49:28 +0100 Message-Id: <20180427134928.4716-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180427134928.4716-1-bruce.richardson@intel.com> References: <20180418210521.277384-1-bruce.richardson@intel.com> <20180427134928.4716-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 3/3] build: ensure compatibility with future meson versions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2018 13:49:47 -0000 Meson 0.46 fixed a bug where "extract_all_objects" would not recursively extract objects not compiled from source for a target. To keep backward compatibility, a "recursive" keyword-arg was added to make this optional. The value is "false" by default for now, but will change to "true" in future, so we hard-code it to "false" in our code to ensure future compatiblity. Signed-off-by: Bruce Richardson --- lib/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/meson.build b/lib/meson.build index 73d6f25c7..ae445153b 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -96,7 +96,7 @@ foreach l:libraries # then use pre-build objects to build shared lib sources = [] - objs += static_lib.extract_all_objects() + objs += static_lib.extract_all_objects(recursive: false) version_map = '@0@/@1@/rte_@2@_version.map'.format( meson.current_source_dir(), dir_name, name) shared_lib = shared_library(libname, -- 2.14.3