diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-01 17:24:02 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:21 +1000 |
| commit | f189af143b59af52990a624995dcbbabe3c7ea50 (patch) | |
| tree | 8c952cb47dae5219a3785e7b4c159774472e0737 | |
| parent | d06df81df21adfaa10497369f06e5d4f51b57611 (diff) | |
| download | samba-f189af143b59af52990a624995dcbbabe3c7ea50.tar.gz samba-f189af143b59af52990a624995dcbbabe3c7ea50.tar.bz2 samba-f189af143b59af52990a624995dcbbabe3c7ea50.zip | |
build: enable nothreads workaround only with WAF_NOTHREADS=1
| -rw-r--r-- | buildtools/wafsamba/nothreads.py | 9 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/buildtools/wafsamba/nothreads.py b/buildtools/wafsamba/nothreads.py index d227ce1a97..9054a57af5 100644 --- a/buildtools/wafsamba/nothreads.py +++ b/buildtools/wafsamba/nothreads.py @@ -213,8 +213,7 @@ class Parallel(object): assert (self.count == 0 or self.stop) -# enable nothreads if -j1 is used from the makefile -if os.environ.get('JOBS') == '1': - import Runner - Runner.process = process - Runner.Parallel = Parallel +# enable nothreads +import Runner +Runner.process = process +Runner.Parallel = Parallel diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 5a48cb4ba1..a7258d3e9e 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -19,7 +19,10 @@ from samba_python import * from samba_deps import * from samba_bundled import * import samba_conftests -import nothreads + +# some systems have broken threading in python +if os.environ.get('WAF_NOTHREADS') == '1': + import nothreads LIB_PATH="shared" |