diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-05 11:55:00 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-05 11:55:00 +0000 |
| commit | 99867b24bf6a8beb6b4198e6c514bcfaa974ff4d (patch) | |
| tree | b9472ef5559e06a6ab8fbf26740facdd7afbe732 /package/iproute2 | |
| parent | 18fbe1a18b0ded009ca3f460f5ea0fb0d2c892b8 (diff) | |
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-a3cf2f4a3e73
Diffstat (limited to 'package/iproute2')
| -rw-r--r-- | package/iproute2/Makefile | 5 | ||||
| -rw-r--r-- | package/iproute2/patches/110-extra-ccopts.patch | 11 |
2 files changed, 13 insertions, 3 deletions
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 + |