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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18311 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
78b006e0f0
commit
cf3d141a6c
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
Loading…
Reference in New Issue