iproute2: re-enable PIC, it is only applied to libnetlink.a and required for collectd

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

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index dbacd275c6169659dfbe9abb9170d38415a9d1b4..fc47159b0d9777ba908d8dd8cd8150d1a98ee635 100644 (file)
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,35 +8,40 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
-PKG_VERSION:=3.11.0
+PKG_VERSION:=3.15.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/
-PKG_MD5SUM:=d7ffb27bc9f0d80577b1f3fb9d1a7689
+PKG_MD5SUM:=5b1711c9d16071959052e369a2682d77
 PKG_BUILD_PARALLEL:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iproute2/Default
+  TITLE:=Routing control utility ($(2))
   SECTION:=net
   CATEGORY:=Network
-  URL:=http://linux-net.osdl.org/index.php/Iproute2
-endef
-
-define Package/ip
-$(call Package/iproute2/Default)
+  URL:=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
   SUBMENU:=Routing and Redirection
+  MAINTAINER:=Russell Senior <russell@personaltelco.net>
   DEPENDS:= +libnl-tiny
-  TITLE:=Routing control utility
+  VARIANT:=$(1)
 endef
 
+Package/ip=$(call Package/iproute2/Default,tiny,Minimal)
+Package/ip-full=$(call Package/iproute2/Default,full,Full)
+
 define Package/ip/conffiles
 /etc/iproute2/rt_tables
 endef
 
+define Package/ip-$(BUILD_VARIANT)/conffiles
+$(Package/ip/conffiles)
+endef
+
 define Package/tc
 $(call Package/iproute2/Default)
   TITLE:=Traffic control utility
@@ -53,6 +58,10 @@ $(call Package/iproute2/Default)
   TITLE:=Socket statistics utility
 endef
 
+ifeq ($(BUILD_VARIANT),tiny)
+  IP_CONFIG_TINY:=y
+endif
+
 define Build/Configure
        $(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
        $(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
@@ -69,9 +78,14 @@ ifdef CONFIG_USE_EGLIBC
   endif
 endif
 
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+
 MAKE_FLAGS += \
        EXTRA_CCOPTS="$(TARGET_CFLAGS) -I../include -I$(STAGING_DIR)/usr/include/libnl-tiny" \
        KERNEL_INCLUDE="$(LINUX_DIR)/include" \
+       SHARED_LIBS="" \
+       LDFLAGS="-Wl,--gc-sections" \
+       IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
        FPIC="$(FPIC)"
 
 define Build/Compile
@@ -92,6 +106,10 @@ define Package/ip/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/
 endef
 
+define Package/ip-$(BUILD_VARIANT)/install
+       $(Package/ip/install)
+endef
+
 define Package/tc/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/
@@ -110,6 +128,7 @@ define Package/ss/install
 endef
 
 $(eval $(call BuildPackage,ip))
+$(eval $(call BuildPackage,ip-full))
 $(eval $(call BuildPackage,tc))
 $(eval $(call BuildPackage,genl))
 $(eval $(call BuildPackage,ss))