1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 04:48:57 +02:00

add portability fixes for toolchain/tools (full tools/toolchain build works on osx now)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4867 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-09-27 17:03:36 +00:00
parent 44af1866aa
commit 652d907345
10 changed files with 170 additions and 11 deletions

View File

@ -4,6 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
OS:=$(shell uname)
ifneq ($(strip $(PKG_CAT)),)
ifeq ($(PKG_CAT),unzip)
UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)

View File

@ -106,7 +106,7 @@ IPKG:= \
# invoke ipkg-build with some default options
IPKG_BUILD:= \
ipkg-build -c -o root -g root
ipkg-build -c -o 0 -g 0
ifeq ($(CONFIG_ENABLE_LOCALE),true)
DISABLE_NLS:=

View File

@ -37,12 +37,6 @@ TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
$(TOOLCHAIN_STAMP_DIR):
mkdir -p $@
$(STAGING_DIR):
@mkdir -p $@/lib
@mkdir -p $@/include
@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
@ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
$(TOOLCHAIN_BUILD_DIR):
@mkdir -p $@

View File

@ -28,8 +28,10 @@ $(TOOL_STAMP_DIR):
$(STAGING_DIR):
@mkdir -p $@/lib
@mkdir -p $@/include
@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
@mkdir -p $@/include-host
$(CP) ./include/*.h $@/include-host/
@ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
$(TOOL_BUILD_DIR):
@mkdir -p $@

3
tools/include/byteswap.h Normal file
View File

@ -0,0 +1,3 @@
#ifdef __linux__
#include_next <byteswap.h>
#endif

29
tools/include/endian.h Normal file
View File

@ -0,0 +1,29 @@
#ifndef __endian_compat_h
#define __endian_compat_h
#if defined(__linux__)
#include_next <endian.h>
#elif defined(__APPLE__)
#include <machine/endian.h>
#include <machine/byte_order.h>
#define bswap_16(x) NXSwapShort(x)
#define bswap_32(x) NXSwapInt(x)
#define bswap_64(x) NXSwapLongLong(x)
#else
#include <machine/endian.h>
#define bswap_16(x) swap16(x)
#define bswap_32(x) swap32(x)
#define bswap_64(x) swap64(x)
#endif
#ifndef __BYTE_ORDER
#define __BYTE_ORDER BYTE_ORDER
#endif
#ifndef __BIG_ENDIAN
#define __BIG_ENDIAN BIG_ENDIAN
#endif
#ifndef __LITTLE_ENDIAN
#define __LITTLE_ENDIAN LITTLE_ENDIAN
#endif
#endif

62
tools/include/getline.h Normal file
View File

@ -0,0 +1,62 @@
/*-
* Copyright (c) 2006 SPARTA, Inc.
* All rights reserved.
*
* This software was developed by SPARTA ISSO under SPAWAR contract
* N66001-04-C-6019 ("SEFOS").
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef __linux__
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
/*
* Emulate glibc getline() via BSD fgetln().
* Note that outsize is not changed unless memory is allocated.
*/
static inline ssize_t
getline(char **outbuf, size_t *outsize, FILE *fp)
{
char *buf;
size_t len;
buf = fgetln(fp, &len);
if (buf == NULL)
return (-1);
/* Assumes realloc() accepts NULL for ptr (C99) */
if (*outbuf == NULL || *outsize < len + 1) {
void *tmp = realloc(*outbuf, len + 1);
if (tmp == NULL)
return (-1);
*outbuf = tmp;
*outsize = len + 1;
}
memcpy(*outbuf, buf, len);
(*outbuf)[len] = '\0';
return (len);
}
#endif

View File

@ -440,7 +440,7 @@ NXTARG: ;
}
/* We're a bit of paranoid */
#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__)
#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__) && !defined(__APPLE__)
(void) fdatasync (ifd);
#else
(void) fsync (ifd);
@ -490,7 +490,7 @@ NXTARG: ;
(void) munmap((void *)ptr, sbuf.st_size);
/* We're a bit of paranoid */
#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__)
#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__) && !defined(__APPLE__)
(void) fdatasync (ifd);
#else
(void) fsync (ifd);

View File

@ -18,8 +18,13 @@ PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
include $(INCLUDE_DIR)/host-build.mk
CFLAGS := $(HOSTCFLAGS) -O2 -I../include
ifneq ($(OS),Linux)
CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -I$(STAGING_DIR)/include-host -include getline.h
endif
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/util LINUXDIR=$(LINUX_HEADERS_DIR)
$(MAKE) -C $(PKG_BUILD_DIR)/util LINUXDIR="$(LINUX_HEADERS_DIR)" CFLAGS="$(CFLAGS)" TARGETS=mkfs.jffs2
endef
define Build/Install

View File

@ -0,0 +1,63 @@
diff -urN mtd.old/include/asm/types.h mtd.dev/include/asm/types.h
--- mtd.old/include/asm/types.h 1970-01-01 01:00:00.000000000 +0100
+++ mtd.dev/include/asm/types.h 2006-09-27 16:50:03.000000000 +0200
@@ -0,0 +1,3 @@
+#ifdef linux
+#include_next <asm/types.h>
+#endif
diff -urN mtd.old/util/mkfs.jffs2.c mtd.dev/util/mkfs.jffs2.c
--- mtd.old/util/mkfs.jffs2.c 2004-11-27 00:00:13.000000000 +0100
+++ mtd.dev/util/mkfs.jffs2.c 2006-09-27 16:51:56.000000000 +0200
@@ -68,6 +68,7 @@
#include <zlib.h>
#undef crc32
#include "crc32.h"
+#include <endian.h>
/* Do not use the wierd XPG version of basename */
#undef basename
@@ -1032,7 +1033,7 @@
case S_IFDIR:
if (verbose) {
printf("\td %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) (e->sb.st_uid), (int) (e->sb.st_gid),
e->name);
}
@@ -1041,7 +1042,7 @@
case S_IFSOCK:
if (verbose) {
printf("\ts %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
write_pipe(e);
@@ -1049,7 +1050,7 @@
case S_IFIFO:
if (verbose) {
printf("\tp %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
write_pipe(e);
@@ -1075,7 +1076,7 @@
case S_IFLNK:
if (verbose) {
printf("\tl %04o %9lu %5d:%-3d %s -> %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name,
e->link);
}
@@ -1084,7 +1085,7 @@
case S_IFREG:
if (verbose) {
printf("\tf %04o %9lu %5d:%-3d %s\n",
- e->sb.st_mode & ~S_IFMT, e->sb.st_size,
+ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
(int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
}
write_regular_file(e);