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

28 files changed, 119 insertions, 60 deletions

diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 4296c98c3..ed892ce2c 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -64,10 +64,10 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),)
 		-e "s#@@TARGET_CFLAGS@@#$(TARGET_CFLAGS)#" \
 		-e "s#@@TARGET_CXXFLAGS@@#$(TARGET_CXXFLAGS)#" \
 		-e "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" \
-		-e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" \
+		-e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#g" \
 		$(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake
 	(cd ${WRKBUILD} && PATH='${HOST_PATH}' \
-		cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		cmake VERBOSE=1 -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 			-DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \
 			${CMAKE_FLAGS} ${WRKSRC})
 else ifneq ($(filter minimal,${CONFIG_STYLE}),)
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 2bc2fc468..7cc4fc55d 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -4,7 +4,7 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		cmake
-PKG_VERSION:=		3.0.0
+PKG_VERSION:=		3.0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		21a1c85e1a3b803c4b48e7ff915a863e
 PKG_DESCR:=		cmake utility
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index ef8323909..4b0abd5d9 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -27,8 +27,9 @@ $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN
 
 CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
 CONFIGURE_ARGS+=	--enable-ssl
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-post-install:
+dillo-install:
 	$(INSTALL_DIR) $(IDIR_DILLO)/etc/dillo
 	$(INSTALL_DATA) $(WRKINST)/etc/dillo/* $(IDIR_DILLO)/etc/dillo
 	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin $(IDIR_DILLO)/usr/lib/dillo
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index c7fd739e1..087c7e698 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -42,12 +42,12 @@ endif
 
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			PYTHON="$(PYTHON)" \
-			HOST_CC="${CC_FOR_BUILD}" \
-			HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
-			HOST_CFLAGS="${CFLAGS_FOR_BUILD}" \
-			HOST_LDFLAGS="${LDLAGS_FOR_BUILD}" \
-			HOST_CXX="${CXX_FOR_BUILD}" \
-			HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
+			HOST_CC="${HOST_CC}" \
+			HOST_CPPFLAGS="${HOST_CPPFLAGS}" \
+			HOST_CFLAGS="${HOST_CFLAGS}" \
+			HOST_LDFLAGS="${HOST_LDLAGS}" \
+			HOST_CXX="${HOST_CXX}" \
+			HOST_CXXFLAGS="${HOST_CXXFLAGS}" \
 			HOST_RANLIB="ranlib" HOST_AR="ar" \
 			CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \
 			ac_cv_sqlite_secure_delete=yes \
@@ -108,7 +108,7 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 TARGET_CFLAGS:=		$(subst Os,g3,$(TARGET_CFLAGS))
 endif
 
-XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS)
 XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
 pre-build:
diff --git a/package/libgc/Makefile b/package/libgc/Makefile
index dc3d6d8f9..0a9aa490e 100644
--- a/package/libgc/Makefile
+++ b/package/libgc/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		f40d9a47c90d60791eeecb484f8df5ee
 PKG_DESCR:=		garbage collector library
 PKG_SECTION:=		libs/misc
 PKG_BUILDDEP:=		libatomic_ops
-HOST_BUILDDEP:=		libatomic_ops-host
+HOST_BUILDDEP:=		libatomic_ops-host libgc-host
 PKG_URL:=		http://www.hboehm.info/gc/
 PKG_SITES:=		http://www.hboehm.info/gc/gc_source/
 PKG_OPTS:=		dev
@@ -24,6 +24,8 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBGC,libgc,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBGC,libgc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_CPPFLAGS+=	-DNO_GETCONTEXT
+
 libgc-install:
 	$(INSTALL_DIR) $(IDIR_LIBGC)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libgc*.so* \
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index 813352f03..d51b19b3d 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		omxplayer
-# actually 46616c55c2fad3dac47d17e8a6b41a16a4d6f15e from 13.04.2014
-PKG_VERSION:=		0.5
+# actually git from 25.09.2014
+PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1c882539dfcbc4e8efeae85ff8069cbe
+PKG_MD5SUM:=		19efdc33063526e6996bdc44190c6d4e
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre
@@ -16,8 +16,6 @@ PKG_BUILDDEP:=		ffmpeg boost bcm2835-vc freetype pcre dbus
 PKG_URL:=		https://github.com/popcornmix/omxplayer
 PKG_SITES:=		http://openadk.org/distfiles/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 PKG_LIBC_DEPENDS:=      glibc musl
 
@@ -27,8 +25,7 @@ $(eval $(call PKG_template,OMXPLAYER,omxplayer,$(PKG_VERSION)-${PKG_RELEASE},${P
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
-TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
-			-I$(STAGING_TARGET_DIR)/usr/include/freetype2 \
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/freetype2 \
 			-I$(STAGING_TARGET_DIR)/usr/include/dbus-1.0 \
 			-I$(STAGING_TARGET_DIR)/opt/vc/include \
 			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \
diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile
index 03a6f5e8b..d321eff17 100644
--- a/package/omxplayer/patches/patch-Makefile
+++ b/package/omxplayer/patches/patch-Makefile
@@ -1,20 +1,14 @@
---- omxplayer-0.4.orig/Makefile	2014-04-07 13:50:34.000000000 +0200
-+++ omxplayer-0.4/Makefile	2014-04-07 16:25:29.144139758 +0200
+--- omxplayer-0.6.orig/Makefile	2014-08-27 21:32:21.000000000 +0200
++++ omxplayer-0.6/Makefile	2014-09-25 12:37:02.000000000 +0200
 @@ -2,9 +2,9 @@ include Makefile.include
  
  CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
  
 -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
-+LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static
++LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
  
--INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
 +INCLUDES+=-I./ -Ilinux
  
  DIST ?= omxplayer-dist
  
-@@ -71,5 +71,4 @@ dist: omxplayer.bin
- 	cp omxplayer omxplayer.bin $(DIST)/usr/bin
- 	cp COPYING $(DIST)/usr/share/doc/
- 	cp README.md $(DIST)/usr/share/doc/README
--	cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
- 	cd $(DIST); tar -czf ../$(DIST).tgz *
diff --git a/package/w3m/Makefile b/package/w3m/Makefile
index 2eaf0d9c4..9f5f7c942 100644
--- a/package/w3m/Makefile
+++ b/package/w3m/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		1b845a983a50b8dec0169ac48479eacc
 PKG_DESCR:=		console web browser
 PKG_SECTION:=		app/browser
 PKG_DEPENDS:=		libgc libncurses
-PKG_BUILDDEP:=		libgc-host libgc ncurses
+PKG_BUILDDEP:=		libgc ncurses
 PKG_URL:=		http://w3m.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=w3m/}
 
@@ -23,6 +23,7 @@ $(eval $(call PKG_template,W3M,w3m,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},
 TARGET_LDFLAGS+=	-lncurses -ltinfo
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ARGS+=	--with-termlib=ncurses \
+			--with-gc=${STAGING_TARGET_DIR}/usr \
 			--enable-image=no
 
 w3m-install:
diff --git a/package/ympd/Makefile b/package/ympd/Makefile
new file mode 100644
index 000000000..c8b64c44c
--- /dev/null
+++ b/package/ympd/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		ympd
+PKG_VERSION:=		1.2.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		add md5sum of package here
+PKG_DESCR:=		standalone mpd web gui written in c
+PKG_SECTION:=		net/http
+PKG_DEPENDS:=		libmpdclient
+PKG_BUILDDEP:=		cmake-host libmpdclient
+PKG_URL:=		http://www.ympd.org/
+PKG_SITES:=		http://www.openadk.org/distfiles/
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,YMPD,ympd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		cmake
+TARGET_CFLAGS+=		-std=c99
+
+pre-build:
+	$(HOST_CC) -o $(WRKBUILD)/mkdata $(WRKBUILD)/htdocs/mkdata.c
+	chmod 755 $(WRKBUILD)/mkdata
+
+ympd-install:
+	$(INSTALL_DIR) $(IDIR_YMPD)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/ympd \
+		$(IDIR_YMPD)/usr/bin
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ympd/patches/patch-CMakeLists_txt b/package/ympd/patches/patch-CMakeLists_txt
new file mode 100644
index 000000000..779a5d26b
--- /dev/null
+++ b/package/ympd/patches/patch-CMakeLists_txt
@@ -0,0 +1,27 @@
+--- ympd-1.2.2.orig/CMakeLists.txt	2014-09-28 13:39:27.000000000 +0200
++++ ympd-1.2.2/CMakeLists.txt	2014-09-28 16:12:53.000000000 +0200
+@@ -16,9 +16,6 @@ include_directories(${PROJECT_BINARY_DIR
+ 
+ include(CheckCSourceCompiles)
+ 
+-set(CMAKE_C_FLAGS "-std=gnu99 -Wall") 
+-set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic")
+-
+ file(GLOB RESOURCES 
+ 	RELATIVE ${PROJECT_SOURCE_DIR}
+ 	htdocs/js/*
+@@ -28,11 +25,11 @@ file(GLOB RESOURCES
+ 	htdocs/index.html
+ )
+ 
+-add_executable(mkdata htdocs/mkdata.c)
+-get_target_property(MKDATA_EXE mkdata LOCATION)
++#add_executable(mkdata htdocs/mkdata.c)
++#get_target_property(MKDATA_EXE mkdata LOCATION)
+ 
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/assets.c
+-    COMMAND ${MKDATA_EXE} ${RESOURCES} > ${PROJECT_BINARY_DIR}/assets.c
++    COMMAND ./mkdata ${RESOURCES} > ${PROJECT_BINARY_DIR}/assets.c
+     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+     DEPENDS ${RESOURCES} mkdata
+ )
diff --git a/scripts/toolchain.cmake.in b/scripts/toolchain.cmake.in
index 85aadcbdd..8d9f82406 100644
--- a/scripts/toolchain.cmake.in
+++ b/scripts/toolchain.cmake.in
@@ -5,9 +5,10 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "OpenADK CFLAGS" FORCE)
 set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "OpenADK CXXFLAGS" FORCE)
 set(CMAKE_INSTALL_SO_NO_EXE 0)
-set(CMAKE_PROGRAM_PATH \"@@STAGING_HOST_DIR@@/usr/bin\")
-set(CMAKE_FIND_ROOT_PATH \"@@STAGING_TARGET_DIR@@\")
+set(CMAKE_PROGRAM_PATH "@@STAGING_HOST_DIR@@/usr/bin")
+set(CMAKE_FIND_ROOT_PATH "@@STAGING_TARGET_DIR@@")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(ENV{PKG_CONFIG_SYSROOT_DIR} \"@@STAGING_TARGET_DIR@@\")
+set(ENV{PKG_CONFIG_SYSROOT_DIR} "@@STAGING_TARGET_DIR@@")
+set(ENV{PKG_CONFIG_LIBDIR} "@@STAGING_TARGET_DIR@@/usr/lib/pkgconfig:@@STAGING_TARGET_DIR@@/usr/share/pkgconfig")
diff --git a/target/arc/uclibc.config b/target/arc/uclibc.config
index 8f9dddb4d..28da1d928 100644
--- a/target/arc/uclibc.config
+++ b/target/arc/uclibc.config
@@ -88,7 +88,7 @@ UCLIBC_CTOR_DTOR=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 MALLOC=y
diff --git a/target/arm/uclibc.config b/target/arm/uclibc.config
index dbf41072b..7322d02e5 100644
--- a/target/arm/uclibc.config
+++ b/target/arm/uclibc.config
@@ -88,7 +88,7 @@ LDSO_GNU_HASH_SUPPORT=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/avr32/uclibc.config b/target/avr32/uclibc.config
index 2d42b019d..81bc22342 100644
--- a/target/avr32/uclibc.config
+++ b/target/avr32/uclibc.config
@@ -85,7 +85,7 @@ LINUXTHREADS_OLD=y
 # LINUXTHREADS_NEW is not set
 # UCLIBC_HAS_THREADS_NATIVE is not set
 UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/bfin/uclibc.config b/target/bfin/uclibc.config
index e57474bba..285b76f5e 100644
--- a/target/bfin/uclibc.config
+++ b/target/bfin/uclibc.config
@@ -88,7 +88,7 @@ LINUXTHREADS_OLD=y
 # LINUXTHREADS_NEW is not set
 # UCLIBC_HAS_THREADS_NATIVE is not set
 UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 MALLOC=y
diff --git a/target/cris/uclibc.config b/target/cris/uclibc.config
index 0b9aa4689..50f921861 100644
--- a/target/cris/uclibc.config
+++ b/target/cris/uclibc.config
@@ -86,7 +86,7 @@ LINUXTHREADS_OLD=y
 # LINUXTHREADS_NEW is not set
 # UCLIBC_HAS_THREADS_NATIVE is not set
 UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/m68k/uclibc.config b/target/m68k/uclibc.config
index 27b9e6923..7abadef09 100644
--- a/target/m68k/uclibc.config
+++ b/target/m68k/uclibc.config
@@ -87,7 +87,7 @@ LINUXTHREADS_OLD=y
 # LINUXTHREADS_NEW is not set
 # UCLIBC_HAS_THREADS_NATIVE is not set
 UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y 
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/mips/uclibc.config b/target/mips/uclibc.config
index 496a21deb..0159d79e7 100644
--- a/target/mips/uclibc.config
+++ b/target/mips/uclibc.config
@@ -94,7 +94,7 @@ UCLIBC_CTOR_DTOR=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/mips64/uclibc.config b/target/mips64/uclibc.config
index 83d14bc49..8f4830f79 100644
--- a/target/mips64/uclibc.config
+++ b/target/mips64/uclibc.config
@@ -94,7 +94,7 @@ UCLIBC_CTOR_DTOR=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/ppc/uclibc.config b/target/ppc/uclibc.config
index b6e877895..7e72c8a4b 100644
--- a/target/ppc/uclibc.config
+++ b/target/ppc/uclibc.config
@@ -87,7 +87,7 @@ LDSO_GNU_HASH_SUPPORT=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/sh/uclibc.config b/target/sh/uclibc.config
index f392f793a..1f9c749c7 100644
--- a/target/sh/uclibc.config
+++ b/target/sh/uclibc.config
@@ -89,7 +89,7 @@ LDSO_GNU_HASH_SUPPORT=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/sparc/uclibc.config b/target/sparc/uclibc.config
index 0220d2c80..31708b380 100644
--- a/target/sparc/uclibc.config
+++ b/target/sparc/uclibc.config
@@ -89,7 +89,7 @@ UCLIBC_CTOR_DTOR=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/x86/uclibc.config b/target/x86/uclibc.config
index 952c4dcfd..b095a1260 100644
--- a/target/x86/uclibc.config
+++ b/target/x86/uclibc.config
@@ -90,7 +90,7 @@ LDSO_GNU_HASH_SUPPORT=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/x86_64/uclibc.config b/target/x86_64/uclibc.config
index 0fb2751e3..ad8ba88a2 100644
--- a/target/x86_64/uclibc.config
+++ b/target/x86_64/uclibc.config
@@ -86,7 +86,7 @@ LDSO_GNU_HASH_SUPPORT=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/target/xtensa/uclibc.config b/target/xtensa/uclibc.config
index 866932381..3229a70fc 100644
--- a/target/xtensa/uclibc.config
+++ b/target/xtensa/uclibc.config
@@ -78,7 +78,7 @@ UCLIBC_CTOR_DTOR=y
 # LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS_NATIVE=yes
 UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index 0ec028126..3a5e903fd 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -39,12 +39,6 @@ ifeq ($(ADK_TARGET_USE_GNU_HASHSTYLE),y)
 else
 	$(SED) 's/.*\(LDSO_GNU_HASH_SUPPORT\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifneq ($(ADK_PACKAGE_GDB),)
-	$(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config
-endif
-ifneq ($(ADK_PACKAGE_GDBSERVER),)
-	$(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config
-endif
 ifeq ($(ADK_TARGET_USE_SSP),y)
 	$(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config
 	echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config
diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile
index 760bbdebe..759db985e 100644
--- a/toolchain/uclibc/Makefile
+++ b/toolchain/uclibc/Makefile
@@ -30,6 +30,10 @@ else
 	$(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
+ifeq ($(ADK_TARGET_UCLINUX),y)
+	$(SED) 's/.*\(UCLIBC_FORMAT_FLAT_SEP_DATA\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(ARCH_USE_MMU\).*/# \1 is not set/' ${WRKBUILD}/.config
+endif
 ifeq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),)
 	$(SED) 's/.*\(HAVE_SHARED\).*/\1=y/' ${WRKBUILD}/.config
 else
@@ -40,12 +44,6 @@ ifeq ($(ADK_TARGET_USE_GNU_HASHSTYLE),y)
 else
 	$(SED) 's/.*\(LDSO_GNU_HASH_SUPPORT\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifneq ($(ADK_PACKAGE_GDB),)
-	$(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config
-endif
-ifneq ($(ADK_PACKAGE_GDBSERVER),)
-	$(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config
-endif
 ifeq ($(ADK_TARGET_USE_SSP),y)
 	$(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config
 	echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config
@@ -154,7 +152,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers
 
 $(WRKBUILD)/.fixup:
 ifeq ($(ADK_UCLIBC_TEST),y)
-	PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
+	PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \
 		TEST_INSTALLED_UCLIBC=1 \
 		UCLIBC_ONLY=1 \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/toolchain/uclibc/patches/0.9.34-git/0007-enable-cancellation-stuff-for-libc_a.patch b/toolchain/uclibc/patches/0.9.34-git/0007-enable-cancellation-stuff-for-libc_a.patch
new file mode 100644
index 000000000..92b532b63
--- /dev/null
+++ b/toolchain/uclibc/patches/0.9.34-git/0007-enable-cancellation-stuff-for-libc_a.patch
@@ -0,0 +1,11 @@
+--- a/libpthread/linuxthreads/Makefile.in.orig	2014-09-27 23:26:40.000000000 +0200
++++ b/libpthread/linuxthreads/Makefile.in	2014-09-27 23:27:12.000000000 +0200
+@@ -65,7 +65,7 @@ CFLAGS-OMIT-libc_pthread_init.c := $(CFL
+ libpthread_libc_CSRC := \
+ 	forward.c libc-cancellation.c libc_pthread_init.c # alloca_cutoff.c
+ libpthread_libc_OBJ  := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_CSRC))
+-libc-static-y += $(libpthread_OUT)/libc_pthread_init.o
++libc-static-y += $(libpthread_OUT)/libc_pthread_init.o $(libpthread_OUT)/libc-cancellation.o
+ libc-shared-y += $(libpthread_libc_OBJ:.o=.oS)
+ 
+ libpthread-static-y += $(patsubst %,$(libpthread_OUT)/%.o,$(libpthread_static_SRC))