Skip to contentSkip to conversation

meson: fix building subdirectories separately

PATCH In review Andrius Sirvys 4 participants 10 messages Mar 5, 2019 – Mar 26, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 meson: fix building subdirectories separately

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

---
v2: Fixed mispellings in commit message

---
 drivers/meson.build | 4 ++--
 meson.build         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/meson.build +2 -2
index c3c66bb..ebe1104 100644
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 # Defines the order in which the drivers are buit.
-driver_classes = ['common',
+dpdk_driver_classes = ['common',
 	       'bus',
 	       'mempool', # depends on common and bus.
 	       'net',     # depends on common, bus and mempool.
@@ -20,7 +20,7 @@ endif
 # specify -D_GNU_SOURCE unconditionally
 default_cflags += '-D_GNU_SOURCE'
 
-foreach class:driver_classes
+foreach class:dpdk_driver_classes
 	drivers = []
 	std_deps = []
 	config_flag_fmt = '' # format string used to set the value in dpdk_conf
meson.build +2 -1
index 7f5e867..7785251 100644
@@ -13,6 +13,7 @@ cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
 dpdk_static_libraries = []
+dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
 dpdk_app_link_libraries = []
@@ -110,7 +111,7 @@ message(output_message + '\n')
 # track driver lists easily
 if meson.version().version_compare('>=0.47')
 	output_message = '\n===============\nDrivers Enabled\n===============\n'
-	foreach class:driver_classes
+	foreach class:dpdk_driver_classes
 		class_drivers = get_variable(class + '_drivers')
 		output_message += '\n' + class + ':\n\t'
 		output_count = 0
Signature · 1 line
2.7.4
Acked-by on v2 1/1
#1 lore raw
Quoted 6 lines · Andrius Sirvys

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

Quoted 7 lines

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

---
v2: Fixed mispellings in commit message
---

This can be useful, and a similar change I saw in the windows RFC since it is incrementally adding things to the windows build, and so would hit this error.

Therefore,

#2 lore raw
Quoted 14 lines · Bruce Richardson
Quoted 6 lines · Andrius Sirvys

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

Quoted 7 lines

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

---
v2: Fixed mispellings in commit message
---

Quoted 6 lines

This can be useful, and a similar change I saw in the windows RFC since it is incrementally adding things to the windows build, and so would hit this error.

Therefore,

Actually, one small thing I should have picked up on earlier - I think the title could be reworded a bit. It's not a fix since there is nothing technically wrong with the existing code - it's just harder to go commenting out parts of the build without this change. How about setting the title to: "build: move variable definition to top level", or something similar.

/Bruce

Acked-by
#3 lore raw
Quoted 22 lines · Bruce Richardson
Quoted 14 lines · Bruce Richardson
Quoted 6 lines · Andrius Sirvys

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

Quoted 7 lines

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

---
v2: Fixed mispellings in commit message
---

Quoted 6 lines

This can be useful, and a similar change I saw in the windows RFC since it is incrementally adding things to the windows build, and so would hit this error.

Therefore,

Quoted 9 lines

Actually, one small thing I should have picked up on earlier - I think the title could be reworded a bit. It's not a fix since there is nothing technically wrong with the existing code - it's just harder to go commenting out parts of the build without this change. How about setting the title to: "build: move variable definition to top level", or something similar.

/Bruce

Yes. This will help with the Windows port.

#4 lore raw

PATCH v3 1/1 build: move variable definition to top level

In reply to Andrius Sirvys

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

---
v3: Updated commit message to more accurately reflect the changes

---
 drivers/meson.build        | 4 ++--
 lib/librte_acl/meson.build | 2 +-
 meson.build                | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/meson.build +2 -2
index c3c66bb..ebe1104 100644
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 # Defines the order in which the drivers are buit.
-driver_classes = ['common',
+dpdk_driver_classes = ['common',
 	       'bus',
 	       'mempool', # depends on common and bus.
 	       'net',     # depends on common, bus and mempool.
@@ -20,7 +20,7 @@ endif
 # specify -D_GNU_SOURCE unconditionally
 default_cflags += '-D_GNU_SOURCE'
 
-foreach class:driver_classes
+foreach class:dpdk_driver_classes
 	drivers = []
 	std_deps = []
 	config_flag_fmt = '' # format string used to set the value in dpdk_conf
lib/librte_acl/meson.build +1 -1
index aec792f..2207dba 100644
@@ -23,7 +23,7 @@ if arch_subdir == 'x86'
 		avx2_tmplib = static_library('avx2_tmp',
 				'acl_run_avx2.c',
 				dependencies: static_rte_eal,
-				c_args: '-mavx2')
+				c_args: cflags + ['-mavx2'])
 		objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
 		cflags += '-DCC_AVX2_SUPPORT'
 	endif
meson.build +2 -1
index 7f5e867..7785251 100644
@@ -13,6 +13,7 @@ cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
 dpdk_static_libraries = []
+dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
 dpdk_app_link_libraries = []
@@ -110,7 +111,7 @@ message(output_message + '\n')
 # track driver lists easily
 if meson.version().version_compare('>=0.47')
 	output_message = '\n===============\nDrivers Enabled\n===============\n'
-	foreach class:driver_classes
+	foreach class:dpdk_driver_classes
 		class_drivers = get_variable(class + '_drivers')
 		output_message += '\n' + class + ':\n\t'
 		output_count = 0
Signature · 1 line
2.7.4
Acked-by on v3 1/1
#5 lore raw

Re: [PATCH v3] build: move variable definition to top level

Quoted 11 lines · Andrius Sirvys

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

---

#6 lore raw

PATCH v4 1/1 build: move variable definition to top level

In reply to Andrius Sirvys

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

---
v4: Removed unreleated files that were accidentally included

---
 drivers/meson.build | 4 ++--
 meson.build         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/meson.build +2 -2
index c3c66bb..ebe1104 100644
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 # Defines the order in which the drivers are buit.
-driver_classes = ['common',
+dpdk_driver_classes = ['common',
 	       'bus',
 	       'mempool', # depends on common and bus.
 	       'net',     # depends on common, bus and mempool.
@@ -20,7 +20,7 @@ endif
 # specify -D_GNU_SOURCE unconditionally
 default_cflags += '-D_GNU_SOURCE'
 
-foreach class:driver_classes
+foreach class:dpdk_driver_classes
 	drivers = []
 	std_deps = []
 	config_flag_fmt = '' # format string used to set the value in dpdk_conf
meson.build +2 -1
index 7f5e867..7785251 100644
@@ -13,6 +13,7 @@ cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
 dpdk_static_libraries = []
+dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
 dpdk_app_link_libraries = []
@@ -110,7 +111,7 @@ message(output_message + '\n')
 # track driver lists easily
 if meson.version().version_compare('>=0.47')
 	output_message = '\n===============\nDrivers Enabled\n===============\n'
-	foreach class:driver_classes
+	foreach class:dpdk_driver_classes
 		class_drivers = get_variable(class + '_drivers')
 		output_message += '\n' + class + ':\n\t'
 		output_count = 0
Signature · 1 line
2.7.4
#7 lore raw

Re: [PATCH v4] build: move variable definition to top level

07/03/2019 12:28, Andrius Sirvys:

Quoted 9 lines

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

Quoted 8 lines

---
v4: Removed unreleated files that were accidentally included

---
 drivers/meson.build | 4 ++--
 meson.build         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Please, could you rebase on top of latest changes in master? Thanks

#8 lore raw

PATCH v5 1/1 build: move variable definition to top level

In reply to Andrius Sirvys

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

---
v5: Rebased off of master branch

---
 drivers/meson.build | 4 ++--
 meson.build         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/meson.build +2 -2
index 69d0556d3..8c76a5659 100644
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 # Defines the order in which the drivers are buit.
-driver_classes = ['common',
+dpdk_driver_classes = ['common',
 	       'bus',
 	       'mempool', # depends on common and bus.
 	       'net',     # depends on common, bus and mempool.
@@ -20,7 +20,7 @@ endif
 # specify -D_GNU_SOURCE unconditionally
 default_cflags += '-D_GNU_SOURCE'
 
-foreach class:driver_classes
+foreach class:dpdk_driver_classes
 	drivers = []
 	std_deps = []
 	config_flag_fmt = '' # format string used to set the value in dpdk_conf
meson.build +2 -1
index 69833de82..e945a27c3 100644
@@ -13,6 +13,7 @@ cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
 dpdk_static_libraries = []
+dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
 dpdk_app_link_libraries = []
@@ -105,7 +106,7 @@ endforeach
 message(output_message + '\n')
 
 output_message = '\n===============\nDrivers Enabled\n===============\n'
-foreach class:driver_classes
+foreach class:dpdk_driver_classes
 	class_drivers = get_variable(class + '_drivers')
 	output_message += '\n' + class + ':\n\t'
 	output_count = 0
Signature · 1 line
2.17.1
#9 lore raw

Re: [PATCH v5] build: move variable definition to top level

25/03/2019 11:34, Andrius Sirvys:

Quoted 11 lines

If for debugging we disable the driver directory in the meson.build file, we get an error because the variable "driver_classes" does not exist. This is because driver_classes is only defined in the drivers/meson.build file. Defining driver_classes in dpdk/meson.build file will make it easier for compiling separate directories.

In the process, we rename driver_classes to dpdk_driver_classes for consistency with the other variables.

Applied, thanks