diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
| commit | b108fdcb83d457e5d43298fb93dbfd805d076f24 (patch) | |
| tree | 7fbd64a13fc915f5cea93708419cb3c6aa1b40ea /package/rt-tests | |
| parent | a6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff) | |
| parent | 9e40a1005f51d10784db295797ed270a130d79d5 (diff) | |
| download | buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.tar.gz buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/dmraid/Config.in
package/gdb/Config.in.host
package/linux-headers/linux-headers.mk
package/python/python.mk
package/python3/python3.mk
package/rt-tests/Config.in
package/sdl/sdl.mk
package/systemd/systemd-01-fix-getty-unit.patch
package/systemd/systemd-02-fix-page-size.patch
package/systemd/systemd-03-uclibc-fix.patch
package/udev/Config.in
package/udisks/Config.in
package/vlc/vlc.mk
system/Config.in
Quite some merge conflicts, hopefully I didn't screw up anything.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/rt-tests')
| -rw-r--r-- | package/rt-tests/Config.in | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in index 89406688e2..28a4a11249 100644 --- a/package/rt-tests/Config.in +++ b/package/rt-tests/Config.in @@ -1,13 +1,9 @@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" - depends on BR2_TOOLCHAIN_HAS_THREADS - # priority-inheritance mutex needs NPTL - depends on !BR2_PTHREADS && !BR2_PTHREADS_OLD - # no NPTL for these archs - depends on !BR2_avr32 && !BR2_xtensa && !BR2_arc && !BR2_bfin # no _tid field in 'struct sigevent' depends on !(BR2_TOOLCHAIN_USES_UCLIBC && (BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el)) + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL help Set of utilities for testing the real-time behaviour of a Linux system. @@ -26,11 +22,10 @@ config BR2_PACKAGE_RT_TESTS http://rt.wiki.kernel.org -comment "rt-tests needs a toolchain w/ threads" - depends on !BR2_PTHREADS && !BR2_PTHREADS_OLD - depends on !BR2_avr32 && !BR2_xtensa && !BR2_arc && !BR2_bfin - depends on !BR2_TOOLCHAIN_HAS_THREADS comment "rt-tests needs an (e)glibc toolchain" depends on BR2_TOOLCHAIN_USES_UCLIBC && (BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el) + +comment "rt-tests needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL |
