add some fixes for compiling on mac os x

SVN-Revision: 574

openwrt/package/linux/linux.mk

@@ -59,6 +59,7 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 	# copy binary drivers
 	cp -a $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl
 	cp -a $(BUILD_DIR)/et/*.o $(LINUX_DIR)/drivers/net/et
+	$(SED) 's/@expr length/@-expr length/' $(LINUX_DIR)/Makefile 
 	touch $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched

openwrt/toolchain/kernel-headers/kernel-headers.mk

@@ -30,6 +30,7 @@ $(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
 		linux-$(LINUX_HEADERS_VERSION)/*/*/Config.in \
 		linux-$(LINUX_HEADERS_VERSION)/*/Config.in
 	ln -sf $(LINUX_HEADERS_DIR)-$(LINUX_HEADERS_VERSION) $(LINUX_HEADERS_DIR)
+	$(SED) 's/@expr length/@-expr length/' $(LINUX_HEADERS_DIR)/Makefile 
 	touch $(LINUX_HEADERS_DIR)/.unpacked
 
 $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.unpacked

openwrt/toolchain/uClibc/uclibc.mk

@@ -99,11 +99,11 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
 		install_dev
-	# Build the host utils.  Need to add an install target...
-	$(MAKE1) -C $(UCLIBC_DIR)/utils \
-		PREFIX=$(STAGING_DIR) \
-		HOSTCC="$(HOSTCC)" \
-		hostutils
+	# Build the host utils.  Need to add an install target... - disabled
+#	$(MAKE1) -C $(UCLIBC_DIR)/utils \
+#		PREFIX=$(STAGING_DIR) \
+#		HOSTCC="$(HOSTCC)" \
+#		hostutils
 	touch -c $(STAGING_DIR)/lib/libc.a
 
 ifneq ($(TARGET_DIR),)

openwrt/toolchain/utils/Makefile

@@ -3,6 +3,11 @@ include $(TOPDIR)/rules.mk
 TARGETS:=sstrip
 UTILS_BUILD_DIR:=$(TOOL_BUILD_DIR)/utils
 
+OS:=$(shell uname)
+ifeq ($(OS),Darwin)
+CFLAGS += -I./include
+endif
+
 prepare: $(UTILS_BUILD_DIR)
 compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS))
 install: compile
@@ -16,6 +21,6 @@ $(UTILS_BUILD_DIR):
 	mkdir -p $(UTILS_BUILD_DIR)
 	
 $(UTILS_BUILD_DIR)/%: src/%.c
-	$(CC) -o $@ $(patsubst $(UTILS_BUILD_DIR)/%,src/%.c,$@)
+	$(CC) $(CFLAGS) -o $@ $(patsubst $(UTILS_BUILD_DIR)/%,src/%.c,$@)
 	chmod 755 $@
 

openwrt/toolchain/utils/src/sstrip.c

@@ -59,6 +59,7 @@
 #include	<unistd.h>
 #include	<fcntl.h>
 #include	<elf.h>
+
 #ifdef __FreeBSD__
 /**
  * This seems to work on FreeBSD 5.3, should
@@ -71,10 +72,18 @@
 #define bswap_64 __bswap64
 #define bswap_32 __bswap32
 #define bswap_16 __bswap16
+#elif defined(__APPLE__)
+#include	<machine/endian.h>
+#include	<machine/byte_order.h>
+#define __BYTE_ORDER BYTE_ORDER
+#define __BIG_ENDIAN BIG_ENDIAN
+#define bswap_16(x) NXSwapShort(x)
+#define bswap_32(x) NXSwapInt(x)
+#define bswap_64(x) NXSwapLongLong(x)
 #else
 #include	<endian.h>
 #include	<byteswap.h>
-#endif /* defined(__FreeBSD__) */
+#endif 
 
 
 #ifndef TRUE