diff options
| author | Jack Lloyd <[email protected]> | 2016-07-04 03:53:17 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-07-04 03:53:17 -0400 |
| commit | 696a8319d1f0652a301b6340bf4f0229090139f4 (patch) | |
| tree | 7a9ce0c741e143d3150c23bbf1f677c8aea51785 | |
| parent | 681ecab83d75f56ff7017ade021ba3d36a099edc (diff) | |
| parent | 667fdf17a0b1c3f3f67dca442592b4745ec97594 (diff) | |
Merge GH #517 FreeBSD enhancements
| -rwxr-xr-x | configure.py | 2 | ||||
| -rw-r--r-- | src/build-data/cc/clang.txt | 2 | ||||
| -rw-r--r-- | src/build-data/os/freebsd.txt | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/configure.py b/configure.py index 324d84079..08babc978 100755 --- a/configure.py +++ b/configure.py @@ -1919,7 +1919,7 @@ def main(argv = None): options.compiler = 'gcc' else: options.compiler = 'msvc' - elif options.os == 'darwin': + elif options.os == 'darwin' or options.os == 'freebsd': if have_program('clang++'): options.compiler = 'clang' else: diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt index 2585190c4..df0f38f74 100644 --- a/src/build-data/cc/clang.txt +++ b/src/build-data/cc/clang.txt @@ -40,6 +40,8 @@ darwin -> "$(LINKER) -headerpad_max_install_names" darwin-debug -> "$(LINKER) -headerpad_max_install_names" linux -> "$(LINKER) -Wl,-rpath=\$$ORIGIN" linux-debug -> "$(LINKER) -Wl,-rpath=\$$ORIGIN" +freebsd -> "$(LINKER) -Wl,-rpath=\$$ORIGIN" +freebsd-debug -> "$(LINKER) -Wl,-rpath=\$$ORIGIN" default -> "$(LINKER)" default-debug -> "$(LINKER)" </binary_link_commands> diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt index dfe3d2edf..9d6ed3614 100644 --- a/src/build-data/os/freebsd.txt +++ b/src/build-data/os/freebsd.txt @@ -1,5 +1,9 @@ os_type unix +soname_pattern_base "libbotan-{version_major}.{version_minor}.so" +soname_pattern_abi "libbotan-{version_major}.{version_minor}.so.{abi_rev}" +soname_pattern_patch "libbotan-{version_major}.{version_minor}.so.{abi_rev}.{version_patch}" + <target_features> clock_gettime gettimeofday |