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

package/libiconv-tiny/Makefile

@@ -15,7 +15,7 @@ PKG_OPTS:=		dev devonly
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc
+PKG_LIBC_DEPENDS:=	uclibc-ng uclibc
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk

package/libnids/Makefile

@@ -17,7 +17,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 

package/librpcsecgss/Makefile

@@ -16,7 +16,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
 
 include $(ADK_TOPDIR)/mk/package.mk
 

package/libunistring/Makefile

@@ -13,7 +13,7 @@ PKG_URL:=		http://www.gnu.org/software/libunistring/
 PKG_SITES:=		${MASTER_SITE_GNU:=libunistring/}
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 

package/pcrepp/Makefile

@@ -16,8 +16,6 @@ PKG_SITES:=		http://www.daemon.de/idisk/Apps/pcre++/
 PKG_CXX:=		PCREPP
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	glibc musl
-
 DISTFILES:=		pcre++-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/pcre++-${PKG_VERSION}
 

target/linux/config/Config.in.debug

@@ -114,6 +114,7 @@ config ADK_KERNEL_OPROFILE
 	tristate "Oprofile support"
 	select ADK_KERNEL_PROFILING
 	depends on !ADK_TARGET_ARCH_M68K
+	depends on !ADK_KERNEL_PREEMPT_RT_FULL
 	default n
 	help
 	  use oprofile package to make use of the kernel support.