aboutsummaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py11
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'] = ''