On 3/25/2021 3:43 PM, Ferruh Yigit wrote:
On 3/24/2021 8:31 PM, David Marchand wrote:
On Wed, Mar 24, 2021 at 8:27 PM Ferruh Yigit <ferruh.yi...@intel.com> wrote:

On 3/23/2021 11:07 AM, Qi Zhang wrote:
1. replace RTE_LIBRTE_IGC_DEBUG_RX with RTE_ETHDEV_DEBUG_RX.
2. replace RTE_LIBRTE_IGC_DEBUG_TX whth RTE_ETHDEV_DEBUG_TX.
3. merge RTE_LIBRTE_ETHDEV_DEBUG into RTE_ETHDEV_DEBUG_TX

Signed-off-by: Qi Zhang <qi.z.zh...@intel.com>

CI is reporting a build error [1], I don't reproduce the error and I assume it
is false positive but can you please check it?

Also cc'ed Zhaoyan & Aaron for the possible CI issue.

[1]
http://mails.dpdk.org/archives/test-report/2021-March/184153.html


Not sure what gcc+debug target is, but I guess it passes the old config item.
The compat stuff should be placed in rte_config.h (or something
similar to config/rte_compatibility_defines.h) and not in
lib/librte_ethdev/rte_ethdev.h.

To reproduce:
$ meson configure $HOME/builds/build-gcc-static/
-Dc_args="-DRTE_LIBRTE_ETHDEV_DEBUG=1"
$ ./devtools/test-meson-builds.sh

Thanks for the steps, I can reproduce it. The alias is not working because 'rte_ethdev.h' where the alias is defined is not included in this path.

Following update should fix it, what do you think?


diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build
index d13f693d3eb8..a9f92cbc4770 100644
--- a/drivers/net/e1000/base/meson.build
+++ b/drivers/net/e1000/base/meson.build
@@ -33,6 +33,6 @@ foreach flag: error_cflags
  endforeach

  base_lib = static_library('e1000_base', sources,
-       dependencies: static_rte_eal,
+       dependencies: [static_rte_eal,static_rte_ethdev],
         c_args: c_args)
  base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/e1000/e1000_logs.h b/drivers/net/e1000/e1000_logs.h
index 86f546b0f9ed..210c3447c66c 100644
--- a/drivers/net/e1000/e1000_logs.h
+++ b/drivers/net/e1000/e1000_logs.h
@@ -7,6 +7,9 @@

  #include <rte_log.h>

+/* included because of RTE_LIBRTE_ETHDEV_DEBUG alias */
+#include <rte_ethdev.h>
+
  extern int e1000_logtype_init;

  #define PMD_INIT_LOG(level, fmt, args...) \

Hi Qi,

Can you make a new version with above fix if it makes sense?

Reply via email to