aboutsummaryrefslogtreecommitdiffstats
path: root/package/iproute2/patches/004-darwin_fixes.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-08-08 21:49:17 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-08-08 21:49:17 +0000
commite71cdf8127b31e8edbdfb6041a915fe2a7e8776d (patch)
tree8ad2e7e85cce535cb675138bdcd1f0efc34c833c /package/iproute2/patches/004-darwin_fixes.patch
parent80e83652aed11f516b5d8f23d586f409a75b8726 (diff)
downloadupstream-e71cdf8127b31e8edbdfb6041a915fe2a7e8776d.tar.gz
upstream-e71cdf8127b31e8edbdfb6041a915fe2a7e8776d.tar.bz2
upstream-e71cdf8127b31e8edbdfb6041a915fe2a7e8776d.zip
package iproute2 has problems building on recent BSD-derived platforms because some programs to be run on the host use malloc.h in an incompatible way.
package/iproute2/patches/004-darwin_fixes.patch has a fix for Darwin, however the fix can be made to work on other BSD platforms by changing the patch as below. I think a similar approach should work for other BSD-derived platforms, replacing the #ifndef __APPLE__ with #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(...) or perhaps even with just #ifdef __linux__ if the set of platforms where malloc.h is ok is small or restricted to just linux In any case, the patch is below. (#3869) Signed-off-by: Luigi Rizzo <rizzo@iet.unipi.it> SVN-Revision: 12249
Diffstat (limited to 'package/iproute2/patches/004-darwin_fixes.patch')
-rw-r--r--package/iproute2/patches/004-darwin_fixes.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/iproute2/patches/004-darwin_fixes.patch b/package/iproute2/patches/004-darwin_fixes.patch
index 3719c7eba1..da7c3ec6db 100644
--- a/package/iproute2/patches/004-darwin_fixes.patch
+++ b/package/iproute2/patches/004-darwin_fixes.patch
@@ -6,7 +6,7 @@ Index: iproute-2.6.20-070313/netem/maketable.c
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
#include <malloc.h>
+#endif
#include <string.h>
@@ -20,7 +20,7 @@ Index: iproute-2.6.20-070313/netem/normal.c
#include <string.h>
#include <limits.h>
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
#include <linux/types.h>
#include <linux/pkt_sched.h>
+#else
@@ -37,7 +37,7 @@ Index: iproute-2.6.20-070313/netem/pareto.c
#include <math.h>
#include <limits.h>
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
#include <linux/types.h>
#include <linux/pkt_sched.h>
+#else
@@ -54,7 +54,7 @@ Index: iproute-2.6.20-070313/netem/paretonormal.c
#include <string.h>
#include <math.h>
#include <limits.h>
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
#include <malloc.h>
-
#include <linux/types.h>