Merge branch 'master' of git+ssh://openadk.org/git/openadk

TODO

@@ -1,12 +1,11 @@
-- update glibc/eglibc to 2.19
 - update gcc to 4.8.2
-- qemu-system-mips64el memory alloc probs
+- add toolchain archive creation target (optimize for size)
 - hash-style=gnu for non-mips and non-musl
-- add toolchain archive creation target
 - add arm hard and softfloat toolchains
 - add misp64 n32/n64 toolchains
 - add support for static toolchains
 - add fb full screen logo
+- qemu-system-mips64el memory alloc probs
 - port opkg with gpg signing
 - restart network (kill wpa_supplicant)
 - essid with spaces
@@ -15,3 +14,5 @@
 - evaluate libguestfs for image creation
 - check for gcc and SSP again
 - port w3m
+- rutorrent porting
+- lms perl 

mk/vars.mk

@@ -168,8 +168,7 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			GCC='$(TARGET_CC)' \
 			CXX='$(TARGET_CXX)' \
 			CROSS='$(TARGET_CROSS)' \
-			CROSS_COMPILE='$(TARGET_CROSS)' \
-			ARCH=${ARCH}
+			CROSS_COMPILE='$(TARGET_CROSS)'
 
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
 			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \

package/coreutils/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		coreutils
-PKG_VERSION:=		8.21
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		065ba41828644eca5dd8163446de5d64
+PKG_VERSION:=		8.22
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8fb0ae2267aa6e728958adc38f8163a2
 PKG_DESCR:=		basic file, shell and text manipulation utilities
 PKG_SECTION:=		base
 PKG_BUILDDEP:=		gmp autotool

package/coreutils/patches/patch-Makefile_am

@@ -0,0 +1,8 @@
+--- coreutils-8.22.orig/Makefile.am	2013-12-04 15:48:30.000000000 +0100
++++ coreutils-8.22/Makefile.am	2014-02-21 16:15:49.000000000 +0100
+@@ -187,5 +187,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib
+ include $(top_srcdir)/lib/local.mk
+ include $(top_srcdir)/src/local.mk
+ include $(top_srcdir)/doc/local.mk
+-include $(top_srcdir)/man/local.mk
+ include $(top_srcdir)/tests/local.mk

package/coreutils/patches/patch-lib_fseeko_c

@@ -1,15 +0,0 @@
---- coreutils-8.21.orig/lib/fseeko.c	2013-01-04 15:07:03.000000000 +0100
-+++ coreutils-8.21/lib/fseeko.c	2013-11-04 20:32:38.000000000 +0100
-@@ -99,6 +99,12 @@ fseeko (FILE *fp, off_t offset, int when
- #elif defined EPLAN9                /* Plan9 */
-   if (fp->rp == fp->buf
-       && fp->wp == fp->buf)
-+#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION
-+  /* Cross-compiling to some other system advertising conformance to
-+     POSIX.1-2008 or later.  Assume fseeko and fflush work as advertised.
-+     If this assumption is incorrect, please report the bug to
-+     bug-gnulib.  */
-+  if (0)
- #else
-   #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
- #endif

package/coreutils/patches/patch-m4_fflush_m4

@@ -1,31 +0,0 @@
---- coreutils-8.21.orig/m4/fflush.m4	2013-01-02 13:34:46.000000000 +0100
-+++ coreutils-8.21/m4/fflush.m4	2013-11-04 20:32:38.000000000 +0100
-@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_FFLUSH],
- [
-   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-   gl_FUNC_FFLUSH_STDIN
--  if test $gl_cv_func_fflush_stdin = no; then
-+  if test $gl_cv_func_fflush_stdin != yes; then
-     REPLACE_FFLUSH=1
-   fi
- ])
-@@ -72,10 +72,17 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
-            return 7;
-          return 0;
-        ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
--     [dnl Pessimistically assume fflush is broken.
--      gl_cv_func_fflush_stdin=no])
-+      [gl_cv_func_fflush_stdin=cross])
-      rm conftest.txt
-     ])
-+   case $gl_cv_func_fflush_stdin in
-+    yes) gl_func_fflush_stdin=1 ;;
-+    no)  gl_func_fflush_stdin=0 ;;
-+    *)   gl_func_fflush_stdin='(-1)' ;;
-+  esac
-+  AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
-+    [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
-+     0 if fflush is known to not work, -1 if unknown.])
- ])
- 
- # Prerequisites of lib/fflush.c.

package/coreutils/patches/patch-m4_fseeko_m4

@@ -1,11 +0,0 @@
---- coreutils-8.21.orig/m4/fseeko.m4	2013-01-02 13:34:46.000000000 +0100
-+++ coreutils-8.21/m4/fseeko.m4	2013-11-04 20:32:38.000000000 +0100
-@@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_FSEEKO],
-     fi
-     m4_ifdef([gl_FUNC_FFLUSH_STDIN], [
-       gl_FUNC_FFLUSH_STDIN
--      if test $gl_cv_func_fflush_stdin = no; then
-+      if test $gl_cv_func_fflush_stdin != yes; then
-         REPLACE_FSEEKO=1
-       fi
-     ])

package/coreutils/patches/patch-m4_spawn_h_m4

@@ -0,0 +1,18 @@
+--- coreutils-8.22.orig/m4/spawn_h.m4	2013-12-04 15:53:33.000000000 +0100
++++ coreutils-8.22/m4/spawn_h.m4	2014-02-21 15:19:26.000000000 +0100
+@@ -64,7 +64,14 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN],
+   dnl once only, before all statements that occur in other macros.
+   AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
+ 
+-  AC_CHECK_FUNCS_ONCE([posix_spawn])
++  LIB_POSIX_SPAWN=
++  AC_SUBST([LIB_POSIX_SPAWN])
++  gl_saved_libs=$LIBS
++    AC_SEARCH_LIBS([posix_spawn], [rt],
++                   [test "$ac_cv_search_posix_spawn" = "none required" ||
++                    LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn])
++    AC_CHECK_FUNCS([posix_spawn])
++  LIBS=$gl_saved_libs
+   if test $ac_cv_func_posix_spawn != yes; then
+     HAVE_POSIX_SPAWN=0
+   fi

package/coreutils/patches/patch-man_local_mk

@@ -1,5 +1,5 @@
---- coreutils-8.21.orig/man/local.mk	2013-02-05 15:01:21.000000000 +0100
-+++ coreutils-8.21/man/local.mk	2013-11-04 20:32:38.000000000 +0100
+--- coreutils-8.22.orig/man/local.mk	2013-12-04 15:48:30.000000000 +0100
++++ coreutils-8.22/man/local.mk	2014-02-21 16:08:08.000000000 +0100
 @@ -18,12 +18,7 @@
  
  EXTRA_DIST += man/help2man man/dummy-man
@@ -8,8 +8,9 @@
 -if HAVE_PERL
 -run_help2man = $(PERL) -- $(srcdir)/man/help2man
 -else
- run_help2man = $(SHELL) $(srcdir)/man/dummy-man
+-run_help2man = $(SHELL) $(srcdir)/man/dummy-man
 -endif
++run_help2man = echo
  
  man1_MANS = @man1_MANS@
  EXTRA_DIST += $(man1_MANS:.1=.x)

package/cryptodev-linux/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cryptodev-linux
 PKG_VERSION:=		1.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		eade38998313c25fd7934719cdf8a2ea
 PKG_DESCR:=		cryptodev-linux kernel module
 PKG_SECTION:=		crypto

package/cryptodev-linux/patches/patch-cryptlib_c

@@ -0,0 +1,38 @@
+--- cryptodev-linux-1.6.orig/cryptlib.c	2013-01-30 17:13:50.000000000 +0100
++++ cryptodev-linux-1.6/cryptlib.c	2014-02-21 14:33:04.000000000 +0100
+@@ -220,7 +220,7 @@ ssize_t cryptodev_cipher_encrypt(struct
+ {
+ 	int ret;
+ 
+-	INIT_COMPLETION(cdata->async.result->completion);
++	reinit_completion(&cdata->async.result->completion);
+ 
+ 	if (cdata->aead == 0) {
+ 		ablkcipher_request_set_crypt(cdata->async.request,
+@@ -243,7 +243,7 @@ ssize_t cryptodev_cipher_decrypt(struct
+ {
+ 	int ret;
+ 
+-	INIT_COMPLETION(cdata->async.result->completion);
++	reinit_completion(&cdata->async.result->completion);
+ 	if (cdata->aead == 0) {
+ 		ablkcipher_request_set_crypt(cdata->async.request,
+ 			(struct scatterlist *)src, dst,
+@@ -355,7 +355,7 @@ ssize_t cryptodev_hash_update(struct has
+ {
+ 	int ret;
+ 
+-	INIT_COMPLETION(hdata->async.result->completion);
++	reinit_completion(&hdata->async.result->completion);
+ 	ahash_request_set_crypt(hdata->async.request, sg, NULL, len);
+ 
+ 	ret = crypto_ahash_update(hdata->async.request);
+@@ -367,7 +367,7 @@ int cryptodev_hash_final(struct hash_dat
+ {
+ 	int ret;
+ 
+-	INIT_COMPLETION(hdata->async.result->completion);
++	reinit_completion(&hdata->async.result->completion);
+ 	ahash_request_set_crypt(hdata->async.request, NULL, output, 0);
+ 
+ 	ret = crypto_ahash_final(hdata->async.request);

package/libthread_db/Makefile

@@ -20,6 +20,8 @@ PKG_NAME:=		libthread-db
 PKG_DESCR:=		POSIX threads library for gdb/gdbserver
 PKG_SECTION:=		libs
 
+PKG_CFLINE_LIBTHREAD_DB:=depends on ADK_PACKAGE_GDB || ADK_PACKAGE_GDBSERVER
+
 PKG_ARCH_DEPENDS:=	!m68k
 
 NO_DISTFILES:=		1

package/libx264/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libx264
 # actually is git checkout from 22.01.2014
 PKG_VERSION:=		1.0.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		6be3e8adeaf6b007bbc04026b6ebd304
 PKG_DESCR:=		H264 encoding library
 PKG_SECTION:=		libs
@@ -20,13 +20,22 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIG_STYLE:=		minimal
+
 ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
 CONFIGURE_ARGS+=	--disable-asm
 endif
 CONFIGURE_ARGS+=	--disable-cli \
-			--enable-asm \
+			--disable-opencl \
+			--enable-shared \
+			--prefix=/usr \
+			--host=${REAL_GNU_TARGET_NAME} \
+			--sysroot=${STAGING_TARGET_DIR} \
 			--cross-prefix=$(TARGET_CROSS)
 
+post-configure:
+	cd $(WRKBUILD); $(MAKE) depend
+
 libx264-install:
 	$(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libx264*.so* \

package/libx264/patches/patch-Makefile

@@ -0,0 +1,14 @@
+--- libx264-1.0.1.orig/Makefile	2014-01-22 11:20:21.000000000 +0100
++++ libx264-1.0.1/Makefile	2014-02-22 20:15:00.000000000 +0100
+@@ -201,7 +201,10 @@ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(O
+ 
+ .depend: config.mak
+ 	@rm -f .depend
+-	@$(foreach SRC, $(addprefix $(SRCPATH)/, $(SRCS) $(SRCCLI) $(SRCSO)), $(CC) $(CFLAGS) $(SRC) $(DEPMT) $(SRC:$(SRCPATH)/%.c=%.o) $(DEPMM) 1>> .depend;)
++	echo $(SRCS)
++	echo $(SRCS0)
++	echo $(SRCCLI)
++	$(foreach SRC, $(addprefix $(SRCPATH)/, $(SRCS) $(SRCCLI) $(SRCSO)), $(CC) $(CFLAGS) $(SRC) $(DEPMT) $(SRC:$(SRCPATH)/%.c=%.o) $(DEPMM) 1>> .depend;)
+ 
+ config.mak:
+ 	./configure

package/net-snmp/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		net-snmp
 PKG_VERSION:=		5.7.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		5bddd02e2f82b62daa79f82717737a14
 PKG_DESCR:=		SNMP Agent
 PKG_SECTION:=		net/misc

package/net-snmp/patches/patch-apps_Makefile_in

@@ -0,0 +1,11 @@
+--- net-snmp-5.7.2.orig/apps/Makefile.in	2012-10-10 00:28:58.000000000 +0200
++++ net-snmp-5.7.2/apps/Makefile.in	2014-02-21 11:50:25.000000000 +0100
+@@ -68,7 +68,7 @@ INSTALLSBINPROGS = snmptrapd$(EXEEXT)
+ 
+ INSTALLLIBS     = libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+-SUBDIRS		= snmpnetstat
++#SUBDIRS		= snmpnetstat
+ 
+ FEATUREFILE=../include/net-snmp/features-apps.h
+ 

package/strace/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
 PKG_VERSION:=		4.8
-PKG_RELEASE:=		4
+PKG_RELEASE:=		7
 PKG_MD5SUM:=		c575ef43829586801f514fd91bfe7575
 PKG_DESCR:=		System call trace program
 PKG_SECTION:=		debug

package/strace/patches/patch-defs_h

@@ -1,60 +0,0 @@
---- strace-4.8.orig/defs.h	2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/defs.h	2014-01-15 12:10:01.000000000 +0100
-@@ -37,6 +37,28 @@
- # endif
- #endif
- 
-+#ifdef ARM
-+struct pt_regs { long uregs[18]; };
-+#define ARM_cpsr uregs[16]
-+#define ARM_pc uregs[15]
-+#define ARM_lr uregs[14]
-+#define ARM_sp uregs[13]
-+#define ARM_ip uregs[12]
-+#define ARM_fp uregs[11]
-+#define ARM_r10 uregs[10]
-+#define ARM_r9 uregs[9]
-+#define ARM_r8 uregs[8]
-+#define ARM_r7 uregs[7]
-+#define ARM_r6 uregs[6]
-+#define ARM_r5 uregs[5]
-+#define ARM_r4 uregs[4]
-+#define ARM_r3 uregs[3]
-+#define ARM_r2 uregs[2]
-+#define ARM_r1 uregs[1]
-+#define ARM_r0 uregs[0]
-+#define ARM_ORIG_r0 uregs[17]
-+#endif
-+
- #ifdef MIPS
- # include <sgidefs.h>
- # if _MIPS_SIM == _MIPS_SIM_ABI64
-@@ -155,14 +177,14 @@ extern char *stpcpy(char *dst, const cha
-     || defined(METAG) \
-     || defined(TILE) \
-     || defined(XTENSA) \
--    ) && defined(__GLIBC__)
-+    ) && defined(__linux__)
- # include <sys/ptrace.h>
- #else
- /* Work around awkward prototype in ptrace.h. */
- # define ptrace xptrace
- # include <sys/ptrace.h>
- # undef ptrace
--# ifdef POWERPC
-+# if defined(ARM)
- #  define __KERNEL__
- #  include <asm/ptrace.h>
- #  undef __KERNEL__
-@@ -222,11 +244,6 @@ extern long ptrace(int, int, char *, lon
- # define PTRACE_EVENT_EXIT	6
- #endif
- 
--#if !defined(__GLIBC__)
--# define PTRACE_PEEKUSER PTRACE_PEEKUSR
--# define PTRACE_POKEUSER PTRACE_POKEUSR
--#endif
--
- #if USE_SEIZE
- # undef PTRACE_SEIZE
- # define PTRACE_SEIZE		0x4206

package/strace/patches/patch-process_c

@@ -1,25 +1,5 @@
 --- strace-4.8.orig/process.c	2013-05-18 00:22:19.000000000 +0200
 +++ strace-4.8/process.c	2014-01-15 12:21:31.000000000 +0100
-@@ -55,19 +55,6 @@
- # endif
- #endif
- 
--#ifdef HAVE_LINUX_PTRACE_H
--# undef PTRACE_SYSCALL
--# ifdef HAVE_STRUCT_IA64_FPREG
--#  define ia64_fpreg XXX_ia64_fpreg
--# endif
--# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
--#  define pt_all_user_regs XXX_pt_all_user_regs
--# endif
--# include <linux/ptrace.h>
--# undef ia64_fpreg
--# undef pt_all_user_regs
--#endif
--
- #if defined(SPARC64)
- # define r_pc r_tpc
- # undef PTRACE_GETREGS
 @@ -2857,7 +2844,7 @@ sys_sched_setscheduler(struct tcb *tcp)
  		if (umove(tcp, tcp->u_arg[2], &p) < 0)
  			tprintf(", %#lx", tcp->u_arg[2]);

package/strace/patches/patch-signal_c

@@ -1,31 +1,5 @@
 --- strace-4.8.orig/signal.c	2013-05-23 15:41:23.000000000 +0200
 +++ strace-4.8/signal.c	2013-10-25 14:36:47.000000000 +0200
-@@ -43,17 +43,6 @@
- # ifndef PTRACE_POKEUSR
- #  define PTRACE_POKEUSR PTRACE_POKEUSER
- # endif
--#elif defined(HAVE_LINUX_PTRACE_H)
--# undef PTRACE_SYSCALL
--# ifdef HAVE_STRUCT_IA64_FPREG
--#  define ia64_fpreg XXX_ia64_fpreg
--# endif
--# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
--#  define pt_all_user_regs XXX_pt_all_user_regs
--# endif
--# include <linux/ptrace.h>
--# undef ia64_fpreg
--# undef pt_all_user_regs
- #endif
- 
- #ifdef IA64
-@@ -61,6 +50,7 @@
- #endif
- 
- #if defined(SPARC) || defined(SPARC64) || defined(MIPS)
-+#include <asm/ptrace.h>
- typedef struct {
- 	struct pt_regs		si_regs;
- 	int			si_mask;
 @@ -815,7 +805,7 @@ sys_sigreturn(struct tcb *tcp)
  {
  #if defined(ARM)

package/strace/patches/patch-syscall_c

@@ -1,5 +1,5 @@
 --- strace-4.8.orig/syscall.c	2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/syscall.c	2013-10-25 14:52:35.000000000 +0200
++++ strace-4.8/syscall.c	2014-01-23 19:57:19.000000000 +0100
 @@ -40,17 +40,6 @@
  # ifndef PTRACE_PEEKUSR
  #  define PTRACE_PEEKUSR PTRACE_PEEKUSER
@@ -18,3 +18,18 @@
  #endif
  
  #if defined(SPARC64)
+@@ -72,13 +61,7 @@
+ # include <elf.h>
+ #endif
+ 
+-#if defined(AARCH64)
+-# include <asm/ptrace.h>
+-#endif
+-
+-#if defined(XTENSA)
+-# include <asm/ptrace.h>
+-#endif
++#include <asm/ptrace.h>
+ 
+ #ifndef ERESTARTSYS
+ # define ERESTARTSYS	512

package/strace/patches/patch-util_c

@@ -1,20 +0,0 @@
---- strace-4.8.orig/util.c	2013-05-06 20:23:01.000000000 +0200
-+++ strace-4.8/util.c	2013-10-25 14:54:06.000000000 +0200
-@@ -47,17 +47,6 @@
- #ifdef HAVE_SYS_REG_H
- # include <sys/reg.h>
- # define PTRACE_PEEKUSR PTRACE_PEEKUSER
--#elif defined(HAVE_LINUX_PTRACE_H)
--# undef PTRACE_SYSCALL
--# ifdef HAVE_STRUCT_IA64_FPREG
--#  define ia64_fpreg XXX_ia64_fpreg
--# endif
--# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
--#  define pt_all_user_regs XXX_pt_all_user_regs
--# endif
--# include <linux/ptrace.h>
--# undef ia64_fpreg
--# undef pt_all_user_regs
- #endif
- 
- int

package/wget/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		wget
-PKG_VERSION:=		1.14
+PKG_VERSION:=		1.15
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		12edc291dba8127f2e9696e69f36299e
+PKG_MD5SUM:=		506df41295afc6486662cc47470b4618
 PKG_DESCR:=		retrieving files using HTTP(S) and FTP
 PKG_SECTION:=		www
 PKG_BUILDDEP:=		autotool

package/wget/patches/patch-m4_spawn_h_m4

@@ -0,0 +1,19 @@
+--- wget-1.15.orig/m4/spawn_h.m4	2014-01-19 11:00:21.000000000 +0100
++++ wget-1.15/m4/spawn_h.m4	2014-02-21 17:25:19.000000000 +0100
+@@ -64,7 +64,15 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN],
+   dnl once only, before all statements that occur in other macros.
+   AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
+ 
+-  AC_CHECK_FUNCS_ONCE([posix_spawn])
++  LIB_POSIX_SPAWN=
++  AC_SUBST([LIB_POSIX_SPAWN])
++  gl_saved_libs=$LIBS
++    AC_SEARCH_LIBS([posix_spawn], [rt],
++                   [test "$ac_cv_search_posix_spawn" = "none required" ||
++                    LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn])
++    AC_CHECK_FUNCS([posix_spawn])
++  LIBS=$gl_saved_libs
++
+   if test $ac_cv_func_posix_spawn != yes; then
+     HAVE_POSIX_SPAWN=0
+   fi

toolchain/uClibc/Makefile

@@ -39,19 +39,22 @@ $(WRKBUILD)/.headers:
 	sed -e 's
^KERNEL_HEADERS.*$$
KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"
' \
 	    $(TOPDIR)/target/$(ADK_TARGET_ARCH)/$(UCLIBCCFG) >${WRKBUILD}/.config
 ifeq ($(ADK_TARGET_ABI_N64),y)
-	$(SED)  's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config
-	$(SED)  's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
-	$(SED)  's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
 ifeq ($(ADK_TARGET_ABI_N32),y)
-	$(SED)  's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' ${WRKBUILD}/.config
-	$(SED)  's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
-	$(SED)  's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
 ifeq ($(ADK_TARGET_ABI_O32),y)
-	$(SED)  's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' ${WRKBUILD}/.config
-	$(SED)  's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
-	$(SED)  's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+endif
+ifeq ($(ADK_PACKAGE_GDB),y)
+	$(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config
 endif
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 	$(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config