diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-12-13 17:27:44 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-12-13 22:26:41 +0100 |
| commit | 9eaad202f1579630598c160952da4b29e56d5bdb (patch) | |
| tree | 226dc901ba77cb5ee26b048f080c006e7d3c57b7 /package | |
| parent | a72a670489547a3ca645ff7c3a0d9c3fb66eab51 (diff) | |
toolchain: rework thread options
The selection of linuxthreads, linuxthreads old or NPTL doesn't make a
lot of sense for external toolchains. So, instead, we :
* Introduce an hidden BR2_TOOLCHAIN_HAS_THREADS option, which must be
selected by toolchain specific options when thread support is
available. Package needing to test thread support should use this
option.
* Move the none/linuxthreads/linuxthreads old/NPTL selection to
Buildroot internal toolchain configuration.
* Add an option in external toolchain to tell if thread support is
available or not in the external toolchain. We assume that glibc
without threads is not possible, as Ulrich Drepper said in
http://sourceware.org/ml/libc-alpha/2005-08/msg00091.html
ffmpeg, dmalloc and openvpn are fixed to use the new
BR2_TOOLCHAIN_HAS_THREADS option. For openvpn, --enable-threads=posix
is no longer used, as the configure script doesn't even understand
this option.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/dmalloc/dmalloc.mk | 6 | ||||
| -rw-r--r-- | package/ltp-testsuite/Config.in | 4 | ||||
| -rw-r--r-- | package/multimedia/ffmpeg/ffmpeg.mk | 6 | ||||
| -rw-r--r-- | package/openvpn/openvpn.mk | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 60ad76393..dca0488d5 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -16,10 +16,10 @@ else DMALLOC_CONF_OPT+=--disable-cxx endif -ifeq ($(BR2_PTHREADS_NONE),y) -DMALLOC_CONF_OPT+=--disable-threads -else +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) DMALLOC_CONF_OPT+=--enable-threads +else +DMALLOC_CONF_OPT+=--disable-threads endif define DMALLOC_POST_PATCH diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in index 2ab4134b5..86aa4fb8c 100644 --- a/package/ltp-testsuite/Config.in +++ b/package/ltp-testsuite/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LTP_TESTSUITE bool "ltp-testsuite" - depends on !BR2_PTHREADS_NONE + depends on BR2_TOOLCHAIN_HAS_THREADS help The Linux Test Project provides a huge testsuite for Linux. @@ -13,4 +13,4 @@ config BR2_PACKAGE_LTP_TESTSUITE http://ltp.sourceforge.net/ comment "ltp-testsuite requires a toolchain with thread support" - depends on BR2_PTHREADS_NONE + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index 959efa39b..f0ec93075 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -111,10 +111,10 @@ else FFMPEG_CONF_OPT += --disable-outdevs endif -ifeq ($(BR2_PTHREADS_NONE),y) -FFMPEG_CONF_OPT += --disable-pthreads -else +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) FFMPEG_CONF_OPT += --enable-pthreads +else +FFMPEG_CONF_OPT += --disable-pthreads endif ifeq ($(BR2_PACKAGE_ZLIB),y) diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 7d8fb0c6f..ba9169086 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -8,10 +8,10 @@ OPENVPN_VERSION = 2.1.3 OPENVPN_SITE = http://openvpn.net/release OPENVPN_CONF_OPT = --enable-small -ifeq ($(BR2_PTHREADS_NATIVE),y) - OPENVPN_CONF_OPT += --enable-threads=posix -else +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) OPENVPN_CONF_OPT += --enable-pthread +else + OPENVPN_CONF_OPT += --disable-pthread endif ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) |