diff options
| author | Jack Lloyd <[email protected]> | 2017-03-13 21:03:04 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-03-13 21:03:04 -0400 |
| commit | 52072c0c2c2af5e6194ac65189957d0bccd95d0d (patch) | |
| tree | 1e1d43d461df1933713b7c2b6ebfa06ecc6e2224 | |
| parent | 75d6edba026698a6c3346e14b282a9c3714fbc21 (diff) | |
| parent | 6eb7588d45b7b793b11f67788a2c27eeb0d7796e (diff) | |
Merge GH #912 Fix OpenBSD shared lib name
| -rw-r--r-- | src/build-data/os/openbsd.txt | 4 | ||||
| -rwxr-xr-x | src/scripts/install.py | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt index 0e60abd2e..89d291ddc 100644 --- a/src/build-data/os/openbsd.txt +++ b/src/build-data/os/openbsd.txt @@ -1,6 +1,8 @@ os_type unix -soname_suffix "so" +soname_pattern_base "libbotan-{version_major}.so" +soname_pattern_abi "libbotan-{version_major}.so.{abi_rev}" +soname_pattern_patch "libbotan-{version_major}.so.{abi_rev}.{version_minor}" <target_features> clock_gettime diff --git a/src/scripts/install.py b/src/scripts/install.py index 3384534d6..0a9683ca0 100755 --- a/src/scripts/install.py +++ b/src/scripts/install.py @@ -176,14 +176,14 @@ def main(args = None): copy_executable(os.path.join(out_dir, soname_patch), os.path.join(lib_dir, soname_patch)) - prev_cwd = os.getcwd() - - try: - os.chdir(lib_dir) - force_symlink(soname_patch, soname_abi) - force_symlink(soname_patch, soname_base) - finally: - os.chdir(prev_cwd) + if target_os != "openbsd": + prev_cwd = os.getcwd() + try: + os.chdir(lib_dir) + force_symlink(soname_patch, soname_abi) + force_symlink(soname_patch, soname_base) + finally: + os.chdir(prev_cwd) copy_executable(os.path.join(out_dir, app_exe), os.path.join(bin_dir, app_exe)) |