aboutsummaryrefslogtreecommitdiffstats
path: root/package/iproute2
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-04-08 20:59:28 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-04-08 20:59:28 +0000
commitbaf4a9ed356e45d1c4ae4dabaa6f82cde51001b6 (patch)
tree862beeb9cdccd84fbd9333c3f8dbd616ef85bfde /package/iproute2
parentc1aebcca7051001a95789ddb4b09caf3d208b6c1 (diff)
downloadupstream-baf4a9ed356e45d1c4ae4dabaa6f82cde51001b6.tar.gz
upstream-baf4a9ed356e45d1c4ae4dabaa6f82cde51001b6.tar.bz2
upstream-baf4a9ed356e45d1c4ae4dabaa6f82cde51001b6.zip
Fix MacOSX build errors with iproute2 (#1533)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6904 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/iproute2')
-rw-r--r--package/iproute2/Makefile4
-rw-r--r--package/iproute2/patches/004-darwin_fixes.patch63
2 files changed, 67 insertions, 0 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index e620d12128..600c7734cb 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -63,3 +63,7 @@ endef
$(eval $(call BuildPackage,ip))
$(eval $(call BuildPackage,tc))
+
+$(eval $(call RequireCommand,bison, \
+ $(PKG_NAME) requires GNU bison. \
+))
diff --git a/package/iproute2/patches/004-darwin_fixes.patch b/package/iproute2/patches/004-darwin_fixes.patch
new file mode 100644
index 0000000000..775705c9a4
--- /dev/null
+++ b/package/iproute2/patches/004-darwin_fixes.patch
@@ -0,0 +1,63 @@
+diff -urN iproute2-2.6.15-060110/netem/maketable.c iproute2-2.6.15-060110.new/netem/maketable.c
+--- iproute2-2.6.15-060110/netem/maketable.c 2005-02-09 23:05:41.000000000 +0100
++++ iproute2-2.6.15-060110.new/netem/maketable.c 2007-04-08 22:40:21.000000000 +0200
+@@ -10,7 +10,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
++#ifndef __APPLE__
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urN iproute2-2.6.15-060110/netem/normal.c iproute2-2.6.15-060110.new/netem/normal.c
+--- iproute2-2.6.15-060110/netem/normal.c 2005-03-30 20:11:49.000000000 +0200
++++ iproute2-2.6.15-060110.new/netem/normal.c 2007-04-08 22:47:26.000000000 +0200
+@@ -8,8 +8,12 @@
+ #include <string.h>
+ #include <limits.h>
+
++#ifndef __APPLE__
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>
++#else
++#define NETEM_DIST_SCALE 8192
++#endif
+
+ #define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE
+diff -urN iproute2-2.6.15-060110/netem/pareto.c iproute2-2.6.15-060110.new/netem/pareto.c
+--- iproute2-2.6.15-060110/netem/pareto.c 2005-02-09 23:05:41.000000000 +0100
++++ iproute2-2.6.15-060110.new/netem/pareto.c 2007-04-08 22:48:36.000000000 +0200
+@@ -7,8 +7,12 @@
+ #include <math.h>
+ #include <limits.h>
+
++#ifndef __APPLE__
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>
++#else
++#define NETEM_DIST_SCALE 8192
++#endif
+
+ static const double a=3.0;
+ #define TABLESIZE 16384
+diff -urN iproute2-2.6.15-060110/netem/paretonormal.c iproute2-2.6.15-060110.new/netem/paretonormal.c
+--- iproute2-2.6.15-060110/netem/paretonormal.c 2005-08-08 22:24:41.000000000 +0200
++++ iproute2-2.6.15-060110.new/netem/paretonormal.c 2007-04-08 22:49:56.000000000 +0200
+@@ -15,10 +15,13 @@
+ #include <string.h>
+ #include <math.h>
+ #include <limits.h>
++#ifndef __APPLE__
+ #include <malloc.h>
+-
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>
++#else
++#define NETEM_DIST_SCALE 8192
++#endif
+
+ #define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE