summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2019-02-26 17:46:37 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-03-01 14:19:56 +0100
commit3ce6474b22473860081aa76477b75c302c78afc7 (patch)
treeece55df640f555c325fedac0d70e53da389856eb /config
parent6824f8a6411c278645b6496c9a2ee73bcef81863 (diff)
downloaddpdk-next-eventdev-3ce6474b22473860081aa76477b75c302c78afc7.zip
dpdk-next-eventdev-3ce6474b22473860081aa76477b75c302c78afc7.tar.gz
dpdk-next-eventdev-3ce6474b22473860081aa76477b75c302c78afc7.tar.xz
build: improve pcap dependency handling
pcap has historically shipped a custom pcap-config binary tool which does the job of pkg-config. It was never compatible with cross compilation. Meson uses it when using dependency(), which then means cross compilation fails. Set pcap-config to empty in the meson cross compilation files so that Meson will not use it, and add a fallback in case dependency() fails. libpcap 1.9.0 finally ships a pkg-config file so everything will work out of the box in the future. Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
Diffstat (limited to 'config')
-rw-r--r--config/arm/arm64_armv8_linuxapp_gcc1
-rw-r--r--config/arm/arm64_dpaa2_linuxapp_gcc1
-rw-r--r--config/arm/arm64_dpaa_linuxapp_gcc1
-rw-r--r--config/arm/arm64_thunderx_linuxapp_gcc1
4 files changed, 4 insertions, 0 deletions
diff --git a/config/arm/arm64_armv8_linuxapp_gcc b/config/arm/arm64_armv8_linuxapp_gcc
index 987c02f..5137609 100644
--- a/config/arm/arm64_armv8_linuxapp_gcc
+++ b/config/arm/arm64_armv8_linuxapp_gcc
@@ -3,6 +3,7 @@ c = 'aarch64-linux-gnu-gcc'
cpp = 'aarch64-linux-gnu-cpp'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
+pcap-config = ''
[host_machine]
system = 'linux'
diff --git a/config/arm/arm64_dpaa2_linuxapp_gcc b/config/arm/arm64_dpaa2_linuxapp_gcc
index 7ec74ec..0df8c8f 100644
--- a/config/arm/arm64_dpaa2_linuxapp_gcc
+++ b/config/arm/arm64_dpaa2_linuxapp_gcc
@@ -4,6 +4,7 @@ cpp = 'aarch64-linux-gnu-cpp'
ar = 'aarch64-linux-gnu-ar'
as = 'aarch64-linux-gnu-as'
strip = 'aarch64-linux-gnu-strip'
+pcap-config = ''
[host_machine]
system = 'linux'
diff --git a/config/arm/arm64_dpaa_linuxapp_gcc b/config/arm/arm64_dpaa_linuxapp_gcc
index 73a8f0b..f4b85a8 100644
--- a/config/arm/arm64_dpaa_linuxapp_gcc
+++ b/config/arm/arm64_dpaa_linuxapp_gcc
@@ -4,6 +4,7 @@ cpp = 'aarch64-linux-gnu-cpp'
ar = 'aarch64-linux-gnu-ar'
as = 'aarch64-linux-gnu-as'
strip = 'aarch64-linux-gnu-strip'
+pcap-config = ''
[host_machine]
system = 'linux'
diff --git a/config/arm/arm64_thunderx_linuxapp_gcc b/config/arm/arm64_thunderx_linuxapp_gcc
index 967d9d4..14b8019 100644
--- a/config/arm/arm64_thunderx_linuxapp_gcc
+++ b/config/arm/arm64_thunderx_linuxapp_gcc
@@ -3,6 +3,7 @@ c = 'aarch64-linux-gnu-gcc'
cpp = 'aarch64-linux-gnu-cpp'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
+pcap-config = ''
[host_machine]
system = 'linux'