From c0a339df2c53b06480386b96b534830360c09a50 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 20 Nov 2010 18:31:08 +0000
Subject: unbreak on MirBSD (and, possibly, OpenBSD)

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/busybox/Makefile                           |  2 +-
 package/busybox/patches/007-endianness-check.patch | 38 +++++++++++++++++-----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 47bb590fb..cf093bd19 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.17.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		7360b7138b899ee7fc885791c740c3c3
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
diff --git a/package/busybox/patches/007-endianness-check.patch b/package/busybox/patches/007-endianness-check.patch
index 36e1e2e2e..d63f8bc6f 100644
--- a/package/busybox/patches/007-endianness-check.patch
+++ b/package/busybox/patches/007-endianness-check.patch
@@ -1,7 +1,6 @@
-diff -Nur busybox-1.17.2.orig/include/platform.h busybox-1.17.2/include/platform.h
---- busybox-1.17.2.orig/include/platform.h	2010-08-23 02:44:35.000000000 +0200
-+++ busybox-1.17.2/include/platform.h	2010-09-28 15:20:33.000000000 +0200
-@@ -152,27 +152,37 @@
+--- busybox-1.17.2/include/platform.h~	Sat Nov 20 18:16:57 2010
++++ busybox-1.17.2/include/platform.h	Sat Nov 20 18:19:34 2010
+@@ -152,29 +152,40 @@
  
  #if defined(__digital__) && defined(__unix__)
  # include <sex.h>
@@ -10,6 +9,7 @@ diff -Nur busybox-1.17.2.orig/include/platform.h busybox-1.17.2/include/platform
 -#elif defined __FreeBSD__
 +#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
 +   || defined(__APPLE__)
++# include <sys/time.h>
  # include <sys/resource.h>	/* rlimit */
  # include <machine/endian.h>
  # define bswap_64 __bswap64
@@ -35,8 +35,8 @@ diff -Nur busybox-1.17.2.orig/include/platform.h busybox-1.17.2/include/platform
  # define BB_LITTLE_ENDIAN 0
 -#elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__)
 +#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _LITTLE_ENDIAN
-+# define BB_BIG_ENDIAN 0
-+# define BB_LITTLE_ENDIAN 1
+ # define BB_BIG_ENDIAN 0
+ # define BB_LITTLE_ENDIAN 1
 +#elif defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN
 +# define BB_BIG_ENDIAN 1
 +# define BB_LITTLE_ENDIAN 0
@@ -44,6 +44,28 @@ diff -Nur busybox-1.17.2.orig/include/platform.h busybox-1.17.2/include/platform
 +# define BB_BIG_ENDIAN 0
 +# define BB_LITTLE_ENDIAN 1
 +#elif defined(__386__)
- # define BB_BIG_ENDIAN 0
- # define BB_LITTLE_ENDIAN 1
++# define BB_BIG_ENDIAN 0
++# define BB_LITTLE_ENDIAN 1
+ #else
+ # error "Can't determine endianness"
+ #endif
+@@ -230,7 +241,7 @@ typedef uint32_t bb__aliased_uint32_t FI
+ /* ---- Compiler dependent settings ------------------------- */
+ 
+ #if (defined __digital__ && defined __unix__) \
+- || defined __APPLE__ || defined __FreeBSD__
++ || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # undef HAVE_MNTENT_H
+ # undef HAVE_SYS_STATFS_H
  #else
+--- busybox-1.17.2/include/libbb.h~	Mon Aug 23 00:46:38 2010
++++ busybox-1.17.2/include/libbb.h	Sat Nov 20 18:21:12 2010
+@@ -70,7 +70,7 @@
+ #  include <shadow.h>
+ # endif
+ #endif
+-#if defined __FreeBSD__
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # include <netinet/in.h>
+ # include <arpa/inet.h>
+ #elif defined __APPLE__
-- 
cgit v1.2.3