KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

SVN-Revision: 18311
This commit is contained in:
Felix Fietkau 2009-11-05 11:55:00 +00:00
parent bfba89123b
commit 80a458df05
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/iproute2/Makefile
View file

@ -41,7 +41,6 @@ $(call Package/iproute2/Default)
endef endef
define Build/Configure 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,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
$(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \ $(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
$(PKG_BUILD_DIR)/Makefile $(PKG_BUILD_DIR)/Makefile
@ -53,8 +52,8 @@ define Build/Configure
endef endef
define Build/Compile 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)/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) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) EXTRA_CCOPTS="$(TARGET_CFLAGS)" KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip
endef endef
define Build/InstallDev define Build/InstallDev

11
package/iproute2/patches/110-extra-ccopts.patch Normal file
View file

@ -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