From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 5 Nov 2009 11:55:00 +0000 (+0000)
Subject: Pass TARGET_CFLAGS using and external variable instead a sed expression that can... 
X-Git-Tag: reboot~21957
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=80a458df0518835f1d39ffd6435abdd9a89ee8e1;p=openwrt%2Fstaging%2Flynxis.git

Pass TARGET_CFLAGS using and external variable instead a sed expression that can fail when TARGET_CFLAGS contains the ":" symbol.

Signed-off: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>

SVN-Revision: 18311
---

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index da18b4b0fc..b36b95bc9b 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -41,7 +41,6 @@ $(call Package/iproute2/Default)
 endef
 
 define Build/Configure
-	$(SED) "s:-O2:${TARGET_CFLAGS}:g" $(PKG_BUILD_DIR)/Makefile
 	$(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
 	$(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
 		$(PKG_BUILD_DIR)/Makefile
@@ -53,8 +52,8 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/netem HOSTCC="$(HOSTCC)" CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES"
-	$(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip
+	$(MAKE) -C $(PKG_BUILD_DIR)/netem HOSTCC="$(HOSTCC)" EXTRA_CCOPTS="$(TARGET_CFLAGS)" CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES"
+	$(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) EXTRA_CCOPTS="$(TARGET_CFLAGS)" KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip
 endef
 
 define Build/InstallDev
diff --git a/package/iproute2/patches/110-extra-ccopts.patch b/package/iproute2/patches/110-extra-ccopts.patch
new file mode 100644
index 0000000000..b1edc6a960
--- /dev/null
+++ b/package/iproute2/patches/110-extra-ccopts.patch
@@ -0,0 +1,11 @@
+--- ./Makefile.old	2009-10-18 21:14:18.344641842 +0200
++++ ./Makefile	2009-10-18 21:14:33.558618672 +0200
+@@ -22,7 +22,7 @@
+ 
+ CC = gcc
+ HOSTCC = gcc
+-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
++CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall $(EXTRA_CCOPTS)
+ CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
+