diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 23:39:17 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 23:39:17 +0100 |
| commit | 26f7c999e7c586eeb0eabeaf34ebbc9b3c145d7c (patch) | |
| tree | 22f152f92d6c1e9c325583f46278a385ffefd38b /package/iproute2/patches | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
another round of native compile fixes
Diffstat (limited to 'package/iproute2/patches')
| -rw-r--r-- | package/iproute2/patches/patch-configure | 18 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-netem_Makefile | 14 |
2 files changed, 19 insertions, 13 deletions
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 |