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/sconeserver | |
| 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/sconeserver')
| -rw-r--r-- | package/sconeserver/Config.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index 16b731e873..0e0b07cb63 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -1,11 +1,7 @@ menuconfig BR2_PACKAGE_SCONESERVER bool "sconeserver" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - # pthread_setschedprio needs NPTL - depends on !BR2_PTHREADS && !BR2_PTHREADS_OLD - # no NPTL for these archs - depends on !BR2_avr32 && !BR2_xtensa && !BR2_arc + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_PCRE help Sconeserver is a modular, object-orientated and extremely versatile @@ -103,7 +99,5 @@ comment "ui module requires X.org" endif # BR2_PACKAGE_SCONESERVER -comment "sconeserver needs a toolchain w/ C++, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) - depends on !BR2_PTHREADS && !BR2_PTHREADS_OLD - depends on !BR2_avr32 && !BR2_xtensa && !BR2_arc +comment "sconeserver needs a toolchain w/ C++, NPTL" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS_NPTL) |
