diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-02-19 11:39:42 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2016-02-19 11:39:42 +1100 |
| commit | e4c886f36b39c22f295ac849e9e0f10071d5a2a4 (patch) | |
| tree | bc1a33a28a78d020befd358e944e5217c8f2e78a | |
| parent | c71c91b09d647dfa945d5797de7f86dc24ad7806 (diff) | |
Disable installing PYO and PYC. Fix install paths.
Installing PYO and PYC does not work so disable this. Move the
Python check to the top level and have a single place.
| -rw-r--r-- | rtemstoolkit/wscript | 7 | ||||
| -rw-r--r-- | tester/wscript | 6 | ||||
| -rw-r--r-- | tools/gdb/python/wscript | 3 | ||||
| -rw-r--r-- | wscript | 10 |
4 files changed, 15 insertions, 11 deletions
diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript index ae22a58..c76dd2e 100644 --- a/rtemstoolkit/wscript +++ b/rtemstoolkit/wscript @@ -19,14 +19,11 @@ def configure(conf): conf_libiberty(conf) conf_libelf(conf) - conf.check(header_name='sys/wait.h', features = 'c', mandatory = False) - conf.check_cc(function_name='kill', header_name="signal.h", + conf.check(header_name = 'sys/wait.h', features = 'c', mandatory = False) + conf.check_cc(function_name = 'kill', header_name = "signal.h", features = 'c', mandatory = False) conf.write_config_header('config.h') - conf.load('python') - conf.check_python_version((2,6,6)) - def build(bld): # # The local configuration. diff --git a/tester/wscript b/tester/wscript index 85dbd4a..b47e089 100644 --- a/tester/wscript +++ b/tester/wscript @@ -40,8 +40,6 @@ def options(opt): def configure(conf): recurse(conf) - conf.load('python') - conf.check_python_version((2,6,6)) def build(bld): recurse(bld) @@ -61,13 +59,13 @@ def build(bld): 'rt/test.py', 'rt/version.py'], install_from = '.', - install_path = '${PREFIX}/share/rtems') + install_path = '${PREFIX}/share/rtems/tester') bld(features = 'py', source = ['rt/pygdb/__init__.py', 'rt/pygdb/mi_parser.py', 'rt/pygdb/spark.py'], install_from = '.', - install_path = '${PREFIX}/share/rtems') + install_path = '${PREFIX}/share/rtems/tester') bld.install_files('${PREFIX}/bin', ['rtems-test'], chmod = 0o755) # diff --git a/tools/gdb/python/wscript b/tools/gdb/python/wscript index 1882d0a..2de9ace 100644 --- a/tools/gdb/python/wscript +++ b/tools/gdb/python/wscript @@ -6,8 +6,7 @@ def options(opt): opt.load('python') def configure(conf): - conf.load('python') - conf.check_python_version((2,6,6)) + pass def build(bld): source = ['__init__.py', @@ -98,6 +98,16 @@ def configure(ctx): ctx.end_msg('%s (%s)' % (ctx.env.RTEMS_RELEASE, ctx.env.RTEMS_VERSION)) ctx.env.C_OPTS = ctx.options.c_opts.split(',') check_options(ctx, ctx.options.host) + # + # Common Python check. + # + ctx.load('python') + ctx.check_python_version((2,6,6)) + # + # Installing the PYO,PYC seems broken on 1.8.19. The path is wrong. + # + ctx.env.PYO = 0 + ctx.env.PYC = 0 recurse(ctx) def build(ctx): |