urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-24 04:58:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove manual PKG_CONFIG_PATH configuration.

Browse Source 
Thanks @joemfb!
This commit is contained in:
Elliot Glaysher 2018-04-03 11:05:41 -07:00
parent 6730caa83b
commit 34950b696e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -44,11 +44,6 @@ Some libraries which are not found in major distributions:
are included as git submodules. To build urbit from source, perform the following steps:
## MacOS specifics
On macos, you need to make sure `pkg-config` uses the correct homebrew path.
The `export PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig/:$PKG_CONFIG_PATH`
should setup the `pkg-config` path correctly, solving errors with homebrew package discovery (notably with `openssl` paths).
## Configuration & compilation
(For instructions for legacy meson, also see below)

9
meson.build
View File

@ -278,9 +278,16 @@ configure_file(input : 'include/config.h.in',
configuration : conf_data)
# We expect these libs to supplied with the distribution
openssl_dep = dependency('openssl', version: '>=1.0.0')
curl_dep = dependency('libcurl', version: '>=7.35.0')
if osdet == 'darwin'
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/' ])
openssl_dep = declare_dependency(dependencies: [libcrypto, libssl], include_directories: include_directories('/usr/local/opt/openssl/include'))
else
openssl_dep = dependency('openssl', version: '>=1.0.0')
endif
if(legacy_meson)
gmp_dep = find_library('gmp')
sigsegv_dep = find_library('sigsegv')