From: Ned Ludd <solar@gentoo.org>
Date: Fri, 4 Jun 2004 02:02:29 +0000 (+0000)
Subject: working iproute2. tested with mipsel i386
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=412a7e4b2fff4372f29c3731073820506f4c6e2e;p=openwrt%2Fstaging%2Fadrian.git

working iproute2. tested with mipsel i386

SVN-Revision: 58
---

diff --git a/obsolete-buildroot/make/iproute2.mk b/obsolete-buildroot/make/iproute2.mk
index 7a33034b62..e7210b6cab 100644
--- a/obsolete-buildroot/make/iproute2.mk
+++ b/obsolete-buildroot/make/iproute2.mk
@@ -3,6 +3,7 @@
 # iproute2
 #
 #############################################################
+
 IPROUTE2_DIR=$(BUILD_DIR)/iproute2
 
 #IPROUTE2_SOURCE_URL=ftp://ftp.inr.ac.ru/ip-routing/
@@ -12,7 +13,7 @@ IPROUTE2_DIR=$(BUILD_DIR)/iproute2
 IPROUTE2_SOURCE_URL=http://ftp.debian.org/debian/pool/main/i/iproute/
 IPROUTE2_SOURCE=iproute_20010824.orig.tar.gz
 IPROUTE2_PATCH:=iproute_20010824-8.diff.gz
-
+IPROUTE2_PATCH_2:=iproute2-cross-ar-20010824.patch
 
 $(DL_DIR)/$(IPROUTE2_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(IPROUTE2_SOURCE_URL)$(IPROUTE2_SOURCE)
@@ -26,6 +27,13 @@ $(IPROUTE2_DIR)/.unpacked: $(DL_DIR)/$(IPROUTE2_SOURCE) #$(DL_DIR)/$(IPROUTE2_PA
 	rm -rf $(IPROUTE2_DIR).orig $(IPROUTE2_DIR)
 	zcat $(DL_DIR)/$(IPROUTE2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	#zcat $(DL_DIR)/$(IPROUTE2_PATCH) | patch -p1 -d $(IPROUTE2_DIR)
+	cat $(SOURCE_DIR)/$(IPROUTE2_PATCH_2) | patch -p1 -d $(IPROUTE2_DIR)
+	# fun sed hacks.
+	$(SED) "s:-O2:${TARGET_CFLAGS}:g" $(IPROUTE2_DIR)/Makefile
+ifeq ($(ARCH),i386)
+	@# needed on atleast i386.. however breaks on mipsel
+	$(SED) 's:-I\.\./include-glibc::g' $(IPROUTE2_DIR)/Makefile
+endif
 	touch $(IPROUTE2_DIR)/.unpacked
 
 $(IPROUTE2_DIR)/.configured: $(IPROUTE2_DIR)/.unpacked
@@ -40,13 +48,16 @@ $(IPROUTE2_DIR)/.configured: $(IPROUTE2_DIR)/.unpacked
 	touch  $(IPROUTE2_DIR)/.configured
 
 $(IPROUTE2_DIR)/tc/tc: $(IPROUTE2_DIR)/.configured
-	$(MAKE) -C $(IPROUTE2_DIR) KERNEL_INCLUDE=$(LINUX_SOURCE_DIR)/include CC=$(TARGET_CC) AR=$(TARGET_AR)
+	$(MAKE) -C $(IPROUTE2_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include
 
 $(TARGET_DIR)/usr/sbin/tc: $(IPROUTE2_DIR)/tc/tc
-	# Copy The tc binary
-	cp -af $(IPROUTE2_DIR)/tc/tc $(TARGET_DIR)/usr/sbin/
+	@# Make sure our $(TARGET_DIR)/usr/sbin/ exists.
+	-mkdir -p $(TARGET_DIR)/usr/sbin/
+	@# Copy The tc binary
+	cp -af $(IPROUTE2_DIR)/tc/tc $(TARGET_DIR)/usr/sbin/ && \
+		$(STRIP) $(TARGET_DIR)/usr/sbin/tc
 
-iproute2: $(TARGET_DIR)/usr/sbin/tc 
+iproute2: $(TARGET_DIR)/usr/sbin/tc
 
 iproute2-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(IPROUTE2_DIR) uninstall
@@ -54,4 +65,3 @@ iproute2-clean:
 
 iproute2-dirclean:
 	rm -rf $(IPROUTE2_DIR)
-