diff options
| author | Vladimir Kobal <vlad@prokk.net> | 2022-02-02 17:52:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 17:52:47 +0200 |
| commit | 944a76b98c6c36ebb403c7f9e748876169fdb929 (patch) | |
| tree | 1fef11824dae85017bc4b463aa5657ed0969a403 | |
| parent | c12e5c1137332967243a4ca0f6b2e505c716b9d4 (diff) | |
Fix compilation errors for OpenSSL on macOS (#12048)
Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
| -rwxr-xr-x | netdata-installer.sh | 20 | ||||
| -rwxr-xr-x | packaging/installer/install-required-packages.sh | 5 | ||||
| -rw-r--r-- | packaging/installer/methods/macos.md | 2 |
3 files changed, 21 insertions, 6 deletions
diff --git a/netdata-installer.sh b/netdata-installer.sh index 2336611a24..058e596014 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -27,9 +27,23 @@ fi # ----------------------------------------------------------------------------- # Pull in OpenSSL properly if on macOS -if [ "$(uname -s)" = 'Darwin' ] && [ -d /usr/local/opt/openssl/include ]; then - export C_INCLUDE_PATH="/usr/local/opt/openssl/include" - export LDFLAGS="-L/usr/local/opt/openssl@1.1/lib" +if [ "$(uname -s)" = 'Darwin' ]; then + if brew --prefix > /dev/null 2>&1; then + if brew --prefix --installed openssl > /dev/null 2>&1; then + HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl) + elif brew --prefix --installed openssl@3 > /dev/null 2>&1; then + HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@3) + elif brew --prefix --installed openssl@1.1 > /dev/null 2>&1; then + HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@1.1) + fi + if [ -n "${HOMEBREW_OPENSSL_PREFIX}" ]; then + export CFLAGS="${CFLAGS} -I${HOMEBREW_OPENSSL_PREFIX}/include" + export LDFLAGS="${LDFLAGS} -L${HOMEBREW_OPENSSL_PREFIX}/lib" + fi + HOMEBREW_PREFIX=$(brew --prefix) + export CFLAGS="${CFLAGS} -I${HOMEBREW_PREFIX}/include" + export LDFLAGS="${LDFLAGS} -L${HOMEBREW_PREFIX}/lib" + fi fi # ----------------------------------------------------------------------------- diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index 800fd32401..52fdc348c9 100755 --- a/packaging/installer/install-required-packages.sh +++ b/packaging/installer/install-required-packages.sh @@ -695,6 +695,7 @@ declare -A pkg_json_c_dev=( ['sabayon']="dev-libs/json-c" ['suse']="libjson-c-devel" ['freebsd']="json-c" + ['macos']="json-c" ['default']="json-c-devel" ) @@ -828,7 +829,7 @@ declare -A pkg_libuuid_dev=( ['rhel']="libuuid-devel" ['ol']="libuuid-devel" ['suse']="libuuid-devel" - ['macos']="NOTREQUIRED" + ['macos']="ossp-uuid" ['freebsd']="e2fsprogs-libuuid" ['default']="" ) @@ -1171,7 +1172,7 @@ declare -A pkg_openssl=( ['gentoo']="dev-libs/openssl" ['arch']="openssl" ['freebsd']="openssl" - ['macos']="openssl@1.1" + ['macos']="openssl" ['default']="openssl-devel" ) diff --git a/packaging/installer/methods/macos.md b/packaging/installer/methods/macos.md index 0ae1d9f23b..2d9061e076 100644 --- a/packaging/installer/methods/macos.md +++ b/packaging/installer/methods/macos.md @@ -71,7 +71,7 @@ to install some of Netdata's prerequisites. You can omit `cmake` in case you do [Netdata Cloud](https://learn.netdata.cloud/docs/cloud/). ```bash -brew install ossp-uuid autoconf automake pkg-config libuv lz4 json-c openssl@1.1 libtool cmake +brew install ossp-uuid autoconf automake pkg-config libuv lz4 json-c openssl libtool cmake ``` If you want to use the [database engine](/database/engine/README.md) to store your metrics, you need to download |