[RFC PATCH 01/12] build: fix name of base library object

[Bruce Richardson]

The generation of the base code objects, in the case where the base code
needs separate C files, used the lib_name value, but that was not
actually assigned till later in the loop, meaning the name used was for
the previous driver built. Fix this by moving the 3-line block up in the
loop.

Fixes: 8fa3af6c05f8 ("build: add generic support for base code in drivers")
Cc: stable at dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/meson.build b/drivers/meson.build
index 102a8262e5..02adf51173 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -249,6 +249,10 @@ foreach subpath:subdirs
             continue
         endif
 
+        enabled_drivers += name
+        lib_name = '_'.join(['rte', class, name])
+        dpdk_conf.set(lib_name.to_upper(), 1)
+
         # not all drivers base code is lock annotation safe, so do base code builds before
         # adding on the lock annotation flags. NOTE: If no custom cflags, the lock annotation
         # checks will be done though.
@@ -263,10 +267,6 @@ foreach subpath:subdirs
             sources += base_sources
         endif
 
-        enabled_drivers += name
-        lib_name = '_'.join(['rte', class, name])
-        dpdk_conf.set(lib_name.to_upper(), 1)
-
         if developer_mode and is_windows and use_function_versioning
             message('@0@: Function versioning is not supported by Windows.'.format(name))
         endif
-- 
2.53.0