diff options
| -rw-r--r-- | toolchain/uClibc/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch | 24 |
2 files changed, 21 insertions, 7 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 42ff5abf4a..1b8723f678 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -74,7 +74,7 @@ define Host/Prepare -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \ $(HOST_BUILD_DIR)/.config $(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" - PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \ + PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \ PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \ @@ -88,7 +88,7 @@ endef define Host/Configure endef -UCLIBC_MAKE = PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \ +UCLIBC_MAKE = PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ diff --git a/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch b/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch index 2b290607a7..6c7b221c36 100644 --- a/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch +++ b/toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch @@ -1,29 +1,43 @@ ---- a/extra/scripts/unifdef.c -+++ b/extra/scripts/unifdef.c -@@ -206,7 +206,7 @@ static void done(void); +Index: uClibc-0.9.30.1/extra/scripts/unifdef.c +=================================================================== +--- uClibc-0.9.30.1.orig/extra/scripts/unifdef.c 2008-04-28 01:10:00.000000000 +0200 ++++ uClibc-0.9.30.1/extra/scripts/unifdef.c 2009-08-25 15:20:08.000000000 +0200 +@@ -206,7 +206,11 @@ static void error(const char *); static int findsym(const char *); static void flushline(bool); -static Linetype getline(void); ++#ifndef __CYGWIN__ +static Linetype __getline(void); ++#else ++static Linetype get_line(void); ++#endif static Linetype ifeval(const char **); static void ignoreoff(void); static void ignoreon(void); -@@ -512,7 +512,7 @@ process(void) +@@ -512,7 +516,11 @@ for (;;) { linenum++; - lineval = getline(); ++#ifndef __CYGWIN__ + lineval = __getline(); ++#else ++ lineval = get_line(); ++#endif trans_table[ifstate[depth]][lineval](); debug("process %s -> %s depth %d", linetype_name[lineval], -@@ -526,7 +526,7 @@ process(void) +@@ -526,7 +534,11 @@ * help from skipcomment(). */ static Linetype -getline(void) ++#ifndef __CYGWIN__ +__getline(void) ++#else ++get_line(void) ++#endif { const char *cp; int cursym; |