diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-04-10 15:24:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-04-10 15:24:50 +0200 |
| commit | 8e17e484312946d2c15224f846499e2178dfb7df (patch) | |
| tree | f46970356130454cf57a1f3a42e3345e993ddb09 | |
| parent | 7fe5a57074d554b2f0c8faed4177ffdae0ac9642 (diff) | |
| parent | ebf3cba90795d40111e3dbd2bf531c78203b3195 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/libiconv-tiny/Makefile | 2 | ||||
| -rw-r--r-- | package/libnids/Makefile | 2 | ||||
| -rw-r--r-- | package/librpcsecgss/Makefile | 2 | ||||
| -rwxr-xr-x | package/libunistring/Makefile | 2 | ||||
| -rw-r--r-- | package/pcrepp/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.debug | 1 |
6 files changed, 5 insertions, 6 deletions
diff --git a/package/libiconv-tiny/Makefile b/package/libiconv-tiny/Makefile index 7c81fc6c0..2889a58b9 100644 --- a/package/libiconv-tiny/Makefile +++ b/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 diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 32a907b59..0ae8dfe78 100644 --- a/package/libnids/Makefile +++ b/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 diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 7a1b5116d..280f2fc5a 100644 --- a/package/librpcsecgss/Makefile +++ b/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 diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile index 607bf7e8d..cce139329 100755 --- a/package/libunistring/Makefile +++ b/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 diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile index 581402dc4..8132ef67a 100644 --- a/package/pcrepp/Makefile +++ b/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} diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index d1682093b..181088cc4 100644 --- a/target/linux/config/Config.in.debug +++ b/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. |