From 4153205022eea7764c561e3398eb3dd8bd288e9e Mon Sep 17 00:00:00 2001 From: George Tsiamasiotis Date: Thu, 2 Oct 2025 21:00:22 +0300 Subject: [PATCH] iproute2: split iproute2 configure and compile logic Previously we relied on the iproute2 makefile automatically running the configure script on first run. This does not allow control of some configure options, or of when the configure script is re-run. The motivating usecase here is ./configure --color=auto, though that is not implemented in this commit. Signed-off-by: George Tsiamasiotis Link: https://github.com/openwrt/openwrt/pull/20281 Signed-off-by: Robert Marko --- package/network/utils/iproute2/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 41668e9381..8bcbde0c79 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -161,22 +161,23 @@ ifdef CONFIG_PACKAGE_rdma HAVE_MNL:=y endif -# Disable built-in configure invocation. -Build/Configure= - TARGET_LDFLAGS += -Wl,--as-needed TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny +CONFIGURE_VARS += \ + HAVE_ELF=$(HAVE_ELF) \ + HAVE_MNL=$(HAVE_MNL) \ + HAVE_CAP=$(HAVE_CAP) \ + HAVE_TIRPC=n + +CONFIGURE_ARGS += \ + --include_dir="$(TOOLCHAIN_ROOT_DIR)/usr/include" \ + --libbpf_force=$(LIBBPF_FORCE) + MAKE_FLAGS += \ - KERNEL_INCLUDE="$(TOOLCHAIN_ROOT_DIR)/usr/include" \ SHARED_LIBS=$(SHARED_LIBS) \ IP_CONFIG_TINY=$(IP_CONFIG_TINY) \ BUILD_VARIANT=$(BUILD_VARIANT) \ - LIBBPF_FORCE=$(LIBBPF_FORCE) \ - HAVE_ELF=$(HAVE_ELF) \ - HAVE_MNL=$(HAVE_MNL) \ - HAVE_CAP=$(HAVE_CAP) \ - HAVE_TIRPC=n \ IPT_LIB_DIR=/usr/lib/iptables \ XT_LIB_DIR=/usr/lib/iptables \ TC_CONFIG_XT=$(TC_CONFIG_XT) \ -- 2.30.2