From bd0d13a8c43935aa9dffc8075af31b2f544af3b3 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 27 Apr 2018 14:49:28 +0100 Subject: [PATCH] build: ensure compatibility with future meson versions 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 compatibility. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- lib/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/meson.build b/lib/meson.build index fcc3e8db61..9d11571f92 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -95,7 +95,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.20.1