Fix compilation errors for OpenSSL on macOS (#12048)
Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
Vladimir Kobal committed
Feb 2, 2022 at 17:52 UTC
944a76b98c6c36ebb403c7f9e748876169fdb929
3 files changed
+21
-6
netdata-installer.sh
+17
-3
@@ -27,9 +27,23 @@ fi
27
28
# -----------------------------------------------------------------------------
29
# Pull in OpenSSL properly if on macOS
30
-if [ "$(uname -s)" = 'Darwin' ] && [ -d /usr/local/opt/openssl/include ]; then
31
- export C_INCLUDE_PATH="/usr/local/opt/openssl/include"
32
- export LDFLAGS="-L/usr/local/opt/openssl@1.1/lib"
30
+if [ "$(uname -s)" = 'Darwin' ]; then
31
+ if brew --prefix > /dev/null 2>&1; then
32
+ if brew --prefix --installed openssl > /dev/null 2>&1; then
33
+ HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl)
34
+ elif brew --prefix --installed openssl@3 > /dev/null 2>&1; then
35
+ HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@3)
36
+ elif brew --prefix --installed openssl@1.1 > /dev/null 2>&1; then
37
+ HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@1.1)
38
+ fi
39
+ if [ -n "${HOMEBREW_OPENSSL_PREFIX}" ]; then
40
+ export CFLAGS="${CFLAGS} -I${HOMEBREW_OPENSSL_PREFIX}/include"
41
+ export LDFLAGS="${LDFLAGS} -L${HOMEBREW_OPENSSL_PREFIX}/lib"
42
+ fi
43
+ HOMEBREW_PREFIX=$(brew --prefix)
44
+ export CFLAGS="${CFLAGS} -I${HOMEBREW_PREFIX}/include"
45
+ export LDFLAGS="${LDFLAGS} -L${HOMEBREW_PREFIX}/lib"
46
+ fi
47
fi
48
49
# -----------------------------------------------------------------------------
packaging/installer/install-required-packages.sh
+3
-2
@@ -695,6 +695,7 @@ declare -A pkg_json_c_dev=(
695
['sabayon']="dev-libs/json-c"
696
['suse']="libjson-c-devel"
697
['freebsd']="json-c"
698
+ ['macos']="json-c"
699
['default']="json-c-devel"
700
)
701
@@ -828,7 +829,7 @@ declare -A pkg_libuuid_dev=(
829
['rhel']="libuuid-devel"
830
['ol']="libuuid-devel"
831
['suse']="libuuid-devel"
831
- ['macos']="NOTREQUIRED"
832
+ ['macos']="ossp-uuid"
833
['freebsd']="e2fsprogs-libuuid"
834
['default']=""
835
)
@@ -1171,7 +1172,7 @@ declare -A pkg_openssl=(
1172
['gentoo']="dev-libs/openssl"
1173
['arch']="openssl"
1174
['freebsd']="openssl"
1174
- ['macos']="openssl@1.1"
1175
+ ['macos']="openssl"
1176
['default']="openssl-devel"
1177
)
1178
packaging/installer/methods/macos.md
+1
-1
@@ -71,7 +71,7 @@ to install some of Netdata's prerequisites. You can omit `cmake` in case you do
71
[Netdata Cloud](https://learn.netdata.cloud/docs/cloud/).
72
73
```bash
74
-brew install ossp-uuid autoconf automake pkg-config libuv lz4 json-c openssl@1.1 libtool cmake
74
+brew install ossp-uuid autoconf automake pkg-config libuv lz4 json-c openssl libtool cmake
75
```
76
77
If you want to use the [database engine](/database/engine/README.md) to store your metrics, you need to download