another round of native compile fixes

3 files changed, 23 insertions, 16 deletions

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 1cab309f2..3c6ff16eb 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -19,7 +19,7 @@ PKGSB_TC:=		iptables
 PKGSD_TC_ATM:=		iproute2 traffic control ATM support library
 PKGSS_TC_ATM:=		tc libatm
 PKGSB_TC_ATM:=		linux-atm
-PKGSD_TC_IPT:=		iproute 2 traffic control IPTables support library
+PKGSD_TC_IPT:=		iproute2 traffic control IPTables support library
 PKGSS_TC_IPT:=		tc iptables
 PKGSB_TC_IPT:=		iptables
 PKGSD_IFSTAT:=		iproute2 interface statistics utility
@@ -42,10 +42,11 @@ $(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_
 $(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_RTMON},${PKG_SECTION}))
 $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PKG_SECTION}))
 
+CONFIG_STYLE:=		minimal
 TARGET_CFLAGS+=		-D_GNU_SOURCE
 XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" \
-			HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include"
-CONFIGURE_ENV+=		IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
+			CFLAGS_FOR_BUILD+="-I${LINUX_HEADER_DIR}/include"
+CONFIGURE_ENV+=		CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
 
 ip-install:
 	${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin}
diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure
index a5cf58b45..13b8fc905 100644
--- a/package/iproute2/patches/patch-configure
+++ b/package/iproute2/patches/patch-configure
@@ -7,8 +7,14 @@
 	- additionally output the full compiler command before running
 	  it
 --- iproute2-2.6.37.orig/configure	2011-01-07 18:54:30.000000000 +0100
-+++ iproute2-2.6.37/configure	2011-01-18 02:37:39.800716449 +0100
-@@ -15,7 +15,8 @@ int main(int argc, char **argv) {
++++ iproute2-2.6.37/configure	2011-02-25 21:01:53.000000000 +0100
+@@ -1,4 +1,5 @@
+ #! /bin/bash
++set -x
+ # This is not an autconf generated configure
+ #
+ INCLUDE=${1:-"$PWD/include"}
+@@ -15,7 +16,8 @@ int main(int argc, char **argv) {
  	return 0;
  }
  EOF
@@ -18,7 +24,7 @@
  if [ $? -eq 0 ]
  then
      echo "TC_CONFIG_ATM:=y" >>Config
-@@ -49,7 +50,8 @@ int main(int argc, char **argv)
+@@ -49,7 +51,8 @@ int main(int argc, char **argv)
  
  EOF
  
@@ -28,7 +34,7 @@
  then
  	echo "TC_CONFIG_XT:=y" >>Config
  	echo "using xtables"
-@@ -86,7 +88,8 @@ int main(int argc, char **argv) {
+@@ -86,7 +89,8 @@ int main(int argc, char **argv) {
  }
  
  EOF
@@ -38,7 +44,7 @@
  
  if [ $? -eq 0 ]
  then
-@@ -126,7 +129,8 @@ int main(int argc, char **argv) {
+@@ -126,7 +130,8 @@ int main(int argc, char **argv) {
  }
  
  EOF
@@ -48,7 +54,7 @@
  
  if [ $? -eq 0 ]
  then
-@@ -149,18 +153,8 @@ check_ipt()
+@@ -149,18 +154,8 @@ check_ipt()
  
  check_ipt_lib_dir()
  {
diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile
index b0aa792f7..e49ab4415 100644
--- a/package/iproute2/patches/patch-netem_Makefile
+++ b/package/iproute2/patches/patch-netem_Makefile
@@ -1,27 +1,27 @@
 --- iproute2-2.6.37.orig/netem/Makefile	2011-01-07 18:54:30.000000000 +0100
-+++ iproute2-2.6.37/netem/Makefile	2011-01-18 02:19:41.386925447 +0100
-@@ -2,13 +2,13 @@ DISTGEN = maketable normal pareto pareto
++++ iproute2-2.6.37/netem/Makefile	2011-02-25 19:59:34.000000000 +0100
+@@ -1,14 +1,12 @@
+ DISTGEN = maketable normal pareto paretonormal
  DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
  
- HOSTCC ?= $(CC)
+-HOSTCC ?= $(CC)
 -CCOPTS  = $(CBUILD_CFLAGS)
-+HOSTCFLAGS ?= 
  LDLIBS += -lm 
  
  all: $(DISTGEN) $(DISTDATA)
  
  $(DISTGEN):
 -	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
-+	$(HOSTCC) $(HOSTCFLAGS) -I../include -o $@ $@.c -lm
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I../include -o $@ $@.c -lm
  
  %.dist: %
  	./$* > $@
-@@ -17,7 +17,7 @@ experimental.dist: maketable experimenta
+@@ -17,7 +15,7 @@ experimental.dist: maketable experimenta
  	./maketable experimental.dat > experimental.dist
  
  stats: stats.c
 -	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
-+	$(HOSTCC) $(HOSTCFLAGS) -I../include -o $@ $@.c -lm
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I../include -o $@ $@.c -lm
  
  install: all
  	mkdir -p $(DESTDIR)$(LIBDIR)/tc