build: ensure compatibility with future meson versions
authorBruce Richardson <bruce.richardson@intel.com>
Fri, 27 Apr 2018 13:49:28 +0000 (14:49 +0100)
committerBruce Richardson <bruce.richardson@intel.com>
Tue, 8 May 2018 20:22:02 +0000 (22:22 +0200)
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 <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
lib/meson.build

index fcc3e8d..9d11571 100644 (file)
@@ -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,