diff options
| -rw-r--r-- | package/aiccu/Makefile | 4 | ||||
| -rw-r--r-- | package/aiccu/patches/patch-unix-console_Makefile | 5 | ||||
| -rw-r--r-- | package/zlib/Makefile | 1 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/eglibc-cross.patch | 46 |
4 files changed, 37 insertions, 19 deletions
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 5a82ff0de..0a6d706ed 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= aiccu PKG_VERSION:= 20070115 -PKG_RELEASE:= 8 +PKG_RELEASE:= 9 PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350 PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility PKG_SECTION:= ipv6 @@ -25,7 +25,7 @@ INSTALL_STYLE:= manual TCFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \ -D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\" -TLDFLAGS+= -lpthread -lresolv +TLDFLAGS+= -pthread -lresolv MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' LDFLAGS='${TLDFLAGS}' do-install: diff --git a/package/aiccu/patches/patch-unix-console_Makefile b/package/aiccu/patches/patch-unix-console_Makefile index 8d49be52d..c3e508121 100644 --- a/package/aiccu/patches/patch-unix-console_Makefile +++ b/package/aiccu/patches/patch-unix-console_Makefile @@ -1,6 +1,6 @@ $Id$ --- aiccu.orig/unix-console/Makefile 2007-01-15 12:04:27.000000000 +0100 -+++ aiccu/unix-console/Makefile 2009-12-28 16:39:06.687500000 +0100 ++++ aiccu/unix-console/Makefile 2010-06-17 10:59:40.000000000 +0200 @@ -10,9 +10,9 @@ # $Date: 2007-01-15 11:04:27 $ # **********************************************************/ @@ -21,8 +21,9 @@ $Id$ CFLAGS += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\"" SRCS += ../common/aiccu_linux.c OBJS += ../common/aiccu_linux.o - LDFLAGS += -lpthread -lresolv +-LDFLAGS += -lpthread -lresolv -endif ++LDFLAGS += -pthread -lresolv # FreeBSD -ifeq ($(shell uname | grep -c "FreeBSD"),1) diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 4e316fe5a..58957b639 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -43,6 +43,7 @@ endif do-configure: (cd $(WRKBUILD); $(COPTS) \ + uname="Linux" \ CFLAGS="$(TARGET_CFLAGS) -fPIC" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch index c09b2f752..348232cf0 100644 --- a/toolchain/eglibc/patches/eglibc-cross.patch +++ b/toolchain/eglibc/patches/eglibc-cross.patch @@ -29,21 +29,6 @@ diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c eglibc-2.11.1/libc/sunrpc #include "rpc_parse.h" #include "rpc_util.h" #include "proto.h" -diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c eglibc-2.11.1/libc/sunrpc/rpc_main.c ---- eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c 2010-02-24 08:10:00.000000000 +0100 -+++ eglibc-2.11.1/libc/sunrpc/rpc_main.c 2010-03-22 18:31:31.245661003 +0100 -@@ -37,7 +37,11 @@ - #include <stdio.h> - #include <string.h> - #include <unistd.h> -+#ifdef _CROSS_RPCGEN_ -+#define gettext(X) (X) -+#else - #include <libintl.h> -+#endif - #include <ctype.h> - #include <sys/types.h> - #include <sys/param.h> diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c eglibc-2.11.1/libc/sunrpc/rpc_scan.c --- eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c 2010-02-24 08:10:00.000000000 +0100 +++ eglibc-2.11.1/libc/sunrpc/rpc_scan.c 2010-03-22 18:31:16.146907097 +0100 @@ -74,3 +59,34 @@ diff -Nur eglibc-2.11.1.orig/libc/timezone/Makefile eglibc-2.11.1/libc/timezone/ $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ +diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c eglibc-2.11.1/libc/sunrpc/rpc_main.c +--- eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c 2010-02-24 08:10:00.000000000 +0100 ++++ eglibc-2.11.1/libc/sunrpc/rpc_main.c 2010-06-20 13:32:42.000000000 +0200 +@@ -37,7 +37,11 @@ + #include <stdio.h> + #include <string.h> + #include <unistd.h> ++#ifdef _CROSS_RPCGEN_ ++#define gettext(X) (X) ++#else + #include <libintl.h> ++#endif + #include <ctype.h> + #include <sys/types.h> + #include <sys/param.h> +@@ -996,10 +1000,12 @@ + abort (); + temp = rindex (cmd->infile, '.'); + cp = stpcpy (mkfilename, "Makefile."); +- if (temp != NULL) +- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0'; +- else ++ if (temp != NULL) { ++ strncpy (cp, cmd->infile, temp - cmd->infile); ++ cp[temp - cmd->infile - 1] = '\0'; ++ } else { + stpcpy (cp, cmd->infile); ++ } + + } + else |