diff options
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/configure.py b/configure.py index 416083abc..9aa8b0cec 100755 --- a/configure.py +++ b/configure.py @@ -40,9 +40,9 @@ class BuildConfigurationInformation(object): """ version_major = 1 version_minor = 9 - version_patch = 7 - version_so_patch = 7 - version_suffix = '' + version_patch = 8 + version_so_patch = 8 + version_suffix = '-dev' version_string = '%d.%d.%d%s' % ( version_major, version_minor, version_patch, version_suffix) @@ -725,7 +725,7 @@ class CompilerInfo(object): class OsInfo(object): def __init__(self, infofile): lex_me_harder(infofile, self, - ['aliases', 'target_features', 'supports_shared'], + ['aliases', 'target_features'], { 'os_type': None, 'obj_suffix': 'o', 'so_suffix': 'so', @@ -736,12 +736,18 @@ class OsInfo(object): 'header_dir': 'include', 'lib_dir': 'lib', 'doc_dir': 'share/doc', + 'build_shared': 'yes', 'install_cmd_data': 'install -m 644', 'install_cmd_exec': 'install -m 755' }) self.ar_needs_ranlib = bool(self.ar_needs_ranlib) + if self.build_shared == 'yes': + self.build_shared = True + else: + self.build_shared = False + def ranlib_command(self): if self.ar_needs_ranlib: return 'ranlib' @@ -1481,6 +1487,11 @@ def main(argv = None): archinfo[options.arch], options) + if not osinfo[options.os].build_shared: + if options.build_shared_lib: + logging.info('Disabling shared lib on %s' % (options.os)) + options.build_shared_lib = False + build_config = BuildConfigurationInformation(options, modules_to_use) build_config.public_headers.append( os.path.join(build_config.build_dir, 'build.h')) |