From: Luca Boccassi Date: Fri, 9 Nov 2018 22:48:07 +0000 (+0000) Subject: net/mlx5: fallback quietly if pkg-config is unavailable X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=0c9df53de400e187238fb0b2cf379c1739ed78ac;p=dpdk.git net/mlx5: fallback quietly if pkg-config is unavailable Don't fail the build if pkg-config can't be found, instead print the linker flag as it was doing before the change. Fixes: b6b87939193a ("net/mlx5: use pkg-config to handle SUSE libmnl") Cc: stable@dpdk.org Reported-by: Thomas Monjalon Signed-off-by: Luca Boccassi Acked-by: Shahaf Shuler --- diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 7a50bccd22..895cdfeeda 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -51,7 +51,7 @@ CFLAGS += -D_DEFAULT_SOURCE CFLAGS += -D_XOPEN_SOURCE=600 CFLAGS += $(WERROR_FLAGS) CFLAGS += -Wno-strict-prototypes -CFLAGS += $(shell pkg-config --cflags libmnl) +CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags libmnl) ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y) CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"' CFLAGS += -DMLX5_GLUE_VERSION='"$(LIB_GLUE_VERSION)"' @@ -60,7 +60,7 @@ LDLIBS += -ldl else LDLIBS += -libverbs -lmlx5 endif -LDLIBS += $(shell pkg-config --libs libmnl) +LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs libmnl || echo "-lmnl") LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_pci