urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-05 02:57:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on OSX with MacPorts

Browse Source 
MacPorts OpenSSL seems to include a proper pkgconfig file, so the
openssl dependency just works. N.B. I haven't tested this on a
homebrew system yet.

I also added a note to set LIBRARY_PATH=/opt/local to pick up gmp and
libsigsegv. An alternative would be to specify dirs: ['/opt/local/lib',
'/usr/local/lib'] on each of them.
This commit is contained in:
Jōshin 2019-01-02 10:38:42 -08:00
parent b223cd8799
commit 114deafd54
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -298,7 +298,8 @@ configure_file(input : 'include/config.h.in',
# We expect these libs to supplied with the distribution # We expect these libs to supplied with the distribution
curl_dep = dependency('libcurl', version: '>=7.19.0') curl_dep = dependency('libcurl', version: '>=7.19.0')
if osdet == 'darwin' and not get_option('nix') if (osdet == 'darwin' and not get_option('nix') and
run_command('test', '-d', '/usr/local/opt/openssl/lib').returncode() == 0)
libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/local/opt/openssl/lib/' ]) libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/local/opt/openssl/lib/' ])
libssl = meson.get_compiler('c').find_library('ssl', dirs: [ '/usr/local/opt/openssl/lib/' ]) libssl = meson.get_compiler('c').find_library('ssl', dirs: [ '/usr/local/opt/openssl/lib/' ])
openssl_dep = declare_dependency(dependencies: [libcrypto, libssl], include_directories: include_directories('/usr/local/opt/openssl/include')) openssl_dep = declare_dependency(dependencies: [libcrypto, libssl], include_directories: include_directories('/usr/local/opt/openssl/include'))
@ -310,6 +311,8 @@ if(legacy_meson)
gmp_dep = find_library('gmp') gmp_dep = find_library('gmp')
sigsegv_dep = find_library('sigsegv') sigsegv_dep = find_library('sigsegv')
elif osdet != 'openbsd' elif osdet != 'openbsd'
# XX on OS X with MacPorts, set LIBRARY_PATH=/opt/local/lib to get meson to
# find these.
gmp_dep = meson.get_compiler('c').find_library('gmp') gmp_dep = meson.get_compiler('c').find_library('gmp')
sigsegv_dep = meson.get_compiler('c').find_library('sigsegv') sigsegv_dep = meson.get_compiler('c').find_library('sigsegv')
endif endif