diff options
| author | Alastair Houghton <[email protected]> | 2016-04-07 09:25:48 +0100 |
|---|---|---|
| committer | Alastair Houghton <[email protected]> | 2016-04-07 09:25:48 +0100 |
| commit | b850420855a56d862ca9c05ca1c0acbddae8475e (patch) | |
| tree | 49178e809e653198867e74ff90683c1eab606542 /configure.py | |
| parent | 6a902a886c5b71ac16f2d957b5bdd319ab6eae0b (diff) | |
Fixed shared library behaviour on Darwin/OS X.
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.py b/configure.py index 4739a8937..aeff794a8 100755 --- a/configure.py +++ b/configure.py @@ -100,6 +100,9 @@ class BuildConfigurationInformation(object): version_vc_rev = botan_version.release_vc_rev version_string = '%d.%d.%d' % (version_major, version_minor, version_patch) + # This is used on Darwin for dylib versioning + version_packed = version_major * 1000 + version_minor + """ Constructor """ @@ -1263,6 +1266,8 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'so_abi_rev': build_config.version_so_rev, 'version': build_config.version_string, + 'version_packed': build_config.version_packed, + 'release_type': build_config.version_release_type, 'distribution_info': options.distribution_info, @@ -1381,8 +1386,10 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): } if options.os == 'darwin' and options.build_shared_lib: - vars['cli_post_link_cmd'] = 'install_name_tool -change "/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(CLI)' - vars['test_post_link_cmd'] = 'install_name_tool -change "/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(TEST)' + # In order that these executables work from the build directory, + # we need to change the install names + vars['cli_post_link_cmd'] = 'install_name_tool -change "$(INSTALLED_LIB_DIR)/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(CLI)' + vars['test_post_link_cmd'] = 'install_name_tool -change "$(INSTALLED_LIB_DIR)/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(TEST)' else: vars['cli_post_link_cmd'] = '' vars['test_post_link_cmd'] = '' |