X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fmeson.build;h=9c8eded697e3b319df1d6e89a7750f83c43ce28c;hb=4996b959cde6;hp=a5a6fed06e8cd473368425f14d51b0b88ec988c2;hpb=a20b2c01a7a159609fb732e3ec51b91440a1bf62;p=dpdk.git

diff --git a/drivers/meson.build b/drivers/meson.build
index a5a6fed06e..9c8eded697 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -7,6 +7,7 @@ subdirs = [
 	'bus',
 	'common/mlx5', # depends on bus.
 	'common/qat', # depends on bus.
+	'common/sfc_efx', # depends on bus.
 	'mempool', # depends on common and bus.
 	'net',     # depends on common, bus, mempool
 	'raw',     # depends on common, bus and net.
@@ -32,7 +33,6 @@ endif
 foreach subpath:subdirs
 	drivers = []
 	std_deps = []
-	config_flag_fmt = '' # format string used to set the value in dpdk_conf
 
 	# subpath can be either "class" or "class/driver"
 	if subpath.contains('/')
@@ -58,8 +58,8 @@ foreach subpath:subdirs
 		build = true # set to false to disable, e.g. missing deps
 		reason = '<unknown reason>' # set if build == false to explain
 		name = drv
-		fmt_name = ''
 		sources = []
+		headers = []
 		objs = []
 		cflags = default_cflags
 		includes = [include_directories(drv_path)]
@@ -76,7 +76,7 @@ foreach subpath:subdirs
 
 		if disabled_drivers.contains(drv_path)
 			build = false
-			reason = 'Explicitly disabled via build config'
+			reason = 'explicitly disabled via build config'
 		else
 			# pull in driver directory which should update all the local variables
 			subdir(drv_path)
@@ -89,7 +89,7 @@ foreach subpath:subdirs
 			foreach d:deps
 				if not is_variable('shared_rte_' + d)
 					build = false
-					reason = 'Missing internal dependency, "@0@"'.format(d)
+					reason = 'missing internal dependency, "@0@"'.format(d)
 					message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
 							.format(d, name, 'drivers/' + drv_path))
 				else
@@ -113,47 +113,26 @@ foreach subpath:subdirs
 			lib_name = '_'.join(['rte', class, name])
 			dpdk_conf.set(lib_name.to_upper(), 1)
 
-			if fmt_name == ''
-				fmt_name = name
-			endif
-
-			dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) #old-style macro
-			# for driver compatibility, since we changed the
-			# default to match that of make. Remove in future release
-			# after following deprecation process
-			if config_flag_fmt.contains('_PMD_@0@') and (class == 'crypto'
-					or class == 'compress'
-					or class == 'event')
-				alt_flag_fmt = '_@0@_PMD'.join(
-						config_flag_fmt.split('_PMD_@0@'))
-				if config_flag_fmt.contains('EVENTDEV')
-					alt_flag_fmt = '_@0@_EVENTDEV_PMD'.join(
-						config_flag_fmt.split('_PMD_@0@_EVENTDEV'))
-				endif
-				dpdk_conf.set(alt_flag_fmt.format(
-						fmt_name.to_upper()), 1)
-			endif
-
 			dpdk_extra_ldflags += pkgconfig_extra_libs
 
+			install_headers(headers)
+
 			# generate pmdinfo sources by building a temporary
 			# lib and then running pmdinfogen on the contents of
 			# that lib. The final lib reuses the object files and
 			# adds in the new source file.
-			if not is_windows
-				out_filename = lib_name + '.pmd.c'
-				tmp_lib = static_library('tmp_' + lib_name,
-						sources,
-						include_directories: includes,
-						dependencies: static_deps,
-						c_args: cflags)
-				objs += tmp_lib.extract_all_objects()
-				sources = custom_target(out_filename,
-						command: [pmdinfo, tmp_lib.full_path(),
-							'@OUTPUT@', pmdinfogen],
-						output: out_filename,
-						depends: [pmdinfogen, tmp_lib])
-			endif
+			out_filename = lib_name + '.pmd.c'
+			tmp_lib = static_library('tmp_' + lib_name,
+					sources,
+					include_directories: includes,
+					dependencies: static_deps,
+					c_args: cflags)
+			objs += tmp_lib.extract_all_objects()
+			sources = custom_target(out_filename,
+					command: [pmdinfo, tmp_lib.full_path(),
+						'@OUTPUT@', pmdinfogen],
+					output: out_filename,
+					depends: [tmp_lib])
 
 			# now build the static driver
 			static_lib = static_library(lib_name,
@@ -183,8 +162,10 @@ foreach subpath:subdirs
 			lk_deps = [version_map, def_file, mingw_map]
 			if is_windows
 				if is_ms_linker
-					lk_args = ['-Wl,/def:' + def_file.full_path(),
-						'-Wl,/implib:drivers\\' + implib]
+					lk_args = ['-Wl,/def:' + def_file.full_path()]
+					if meson.version().version_compare('<0.54.0')
+						lk_args += ['-Wl,/implib:drivers\\' + implib]
+					endif
 				else
 					lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
 				endif