diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-08-08 21:49:17 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-08-08 21:49:17 +0000 |
| commit | ee25f777573e647976d4c15fa50e6daa0266855d (patch) | |
| tree | 04dd11a155dc85ec197af80a0f54d8444edb3789 | |
| parent | 73da63389a624b3dcf5e9039b66a83c31270e78f (diff) | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12249 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/iproute2/patches/004-darwin_fixes.patch | 8 |
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 3719c7eba..da7c3ec6d 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> |