hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more cygwin build fixes 

SVN-Revision: 17401
lede-17.01
Florian Fainelli 2009-08-26 07:25:24 +00:00
parent 4c8aa29833
commit ffa2d292fe
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolchain/uClibc/Makefile
View File

@ -74,7 +74,7 @@ define Host/Prepare
-e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \ -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
$(HOST_BUILD_DIR)/.config $(HOST_BUILD_DIR)/.config
$(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" $(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/" \ PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
DEVEL_PREFIX=/usr/ \ DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \ RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
@ -88,7 +88,7 @@ endef
define Host/Configure define Host/Configure
endef endef
UCLIBC_MAKE = PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \ UCLIBC_MAKE = PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
DEVEL_PREFIX=/usr/ \ DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX=/ \ RUNTIME_PREFIX=/ \

24
toolchain/uClibc/patches-0.9.30.1/160-unifdef_fix.patch
View File

@ -1,29 +1,43 @@
--- a/extra/scripts/unifdef.c Index: uClibc-0.9.30.1/extra/scripts/unifdef.c
+++ b/extra/scripts/unifdef.c ===================================================================
@@ -206,7 +206,7 @@ static void done(void); --- 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 void error(const char *);
static int findsym(const char *); static int findsym(const char *);
static void flushline(bool); static void flushline(bool);
-static Linetype getline(void); -static Linetype getline(void);
+#ifndef __CYGWIN__
+static Linetype __getline(void); +static Linetype __getline(void);
+#else
+static Linetype get_line(void);
+#endif
static Linetype ifeval(const char **); static Linetype ifeval(const char **);
static void ignoreoff(void); static void ignoreoff(void);
static void ignoreon(void); static void ignoreon(void);
@@ -512,7 +512,7 @@ process(void) @@ -512,7 +516,11 @@
for (;;) { for (;;) {
linenum++; linenum++;
- lineval = getline(); - lineval = getline();
+#ifndef __CYGWIN__
+ lineval = __getline(); + lineval = __getline();
+#else
+ lineval = get_line();
+#endif
trans_table[ifstate[depth]][lineval](); trans_table[ifstate[depth]][lineval]();
debug("process %s -> %s depth %d", debug("process %s -> %s depth %d",
linetype_name[lineval], linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void) @@ -526,7 +534,11 @@
* help from skipcomment(). * help from skipcomment().
*/ */
static Linetype static Linetype
-getline(void) -getline(void)
+#ifndef __CYGWIN__
+__getline(void) +__getline(void)
+#else
+get_line(void)
+#endif
{ {
const char *cp; const char *cp;
int cursym; int cursym;