Revert "iproute2: simplify linking libelf for eBFP/XDP object file support"

[openwrt/openwrt.git] / package / network / utils / iproute2 / Makefile

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 6e20e34dd83ba2fac05e1f57d50fa27fe433366c..56a16d095c7c679d504fe02afba7b3b0c2f30360 100644 (file)
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -49,7 +49,7 @@ $(call Package/iproute2/Default)
  VARIANT:=full
  PROVIDES:=ip
  ALTERNATIVES:=300:/sbin/ip:/usr/libexec/ip-full
- DEPENDS:=+libnl-tiny +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl
+ DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/tc
@@ -100,15 +100,6 @@ ifeq ($(BUILD_VARIANT),tiny)
   IP_CONFIG_TINY:=y
 endif
 
-ifeq ($(BUILD_VARIANT),full)
-  HAVE_ELF:=y
-endif
-
-ifeq ($(BUILD_VARIANT),tc)
-  HAVE_ELF:=y
-  SHARED_LIBS:=y
-endif
-
 ifdef CONFIG_PACKAGE_devlink
   HAVE_MNL:=y
 endif
@@ -128,9 +119,8 @@ TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
 
 MAKE_FLAGS += \
        KERNEL_INCLUDE="$(LINUX_DIR)/user_headers/include" \
-       SHARED_LIBS=$(SHARED_LIBS) \
+       SHARED_LIBS="" \
        IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
-       HAVE_ELF=$(HAVE_ELF) \
        HAVE_MNL=$(HAVE_MNL) \
        IPT_LIB_DIR=/usr/lib/iptables \
        XT_LIB_DIR=/usr/lib/iptables \
@@ -165,10 +155,6 @@ define Package/tc/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_BIN) ./files/15-teql $(1)/etc/hotplug.d/iface/
-ifeq ($(SHARED_LIBS),y)
-       $(INSTALL_DIR) $(1)/usr/lib/tc
-       $(CP) $(PKG_BUILD_DIR)/tc/*.so $(1)/usr/lib/tc
-endif
 endef
 
 # ensure other packages are only saved during 'tiny' builds.