diff options
| author | George Tsiamasiotis | 2025-10-02 18:00:22 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-10-06 17:08:56 +0000 |
| commit | 4153205022eea7764c561e3398eb3dd8bd288e9e (patch) | |
| tree | e4d96c09f0302e97b6933a77674ba43fcba1cba3 | |
| parent | 2069b83ec6c924d95ce5de6a0514011eeb4dac65 (diff) | |
| download | openwrt-4153205022eea7764c561e3398eb3dd8bd288e9e.tar.gz | |
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 <george@tsiamasiotis.gr>
Link: https://github.com/openwrt/openwrt/pull/20281
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | package/network/utils/iproute2/Makefile | 19 |
1 files 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) \ |