Fix Build on MacOS (#12554)
Timotej S committed
Mar 31, 2022 at 13:59 UTC
6368e23a462bbfbd83447385c4be679e801925f8
2 files changed
+20
-21
configure.ac
+20
@@ -292,6 +292,26 @@ freebsd*)
292
darwin*)
293
build_target=macos
294
LDFLAGS="${LDFLAGS} -framework CoreFoundation -framework IOKit"
295
+ # -----------------------------------------------------------------------------
296
+ # Pull in OpenSSL properly if on macOS
297
+ if brew --prefix > /dev/null 2>&1; then
298
+ if brew --prefix --installed openssl > /dev/null 2>&1; then
299
+ HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl)
300
+ elif brew --prefix --installed openssl@3 > /dev/null 2>&1; then
301
+ HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@3)
302
+ elif brew --prefix --installed openssl@1.1 > /dev/null 2>&1; then
303
+ HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@1.1)
304
+ fi
305
+ if test -n "${HOMEBREW_OPENSSL_PREFIX}"; then
306
+ OPTIONAL_OS_DEP_CFLAGS="-I${HOMEBREW_OPENSSL_PREFIX}/include"
307
+ CFLAGS="${CFLAGS} ${OPTIONAL_OS_DEP_CFLAGS}"
308
+ LDFLAGS="${LDFLAGS} -L${HOMEBREW_OPENSSL_PREFIX}/lib"
309
+ fi
310
+ HOMEBREW_PREFIX=$(brew --prefix)
311
+ OPTIONAL_OS_DEP_CFLAGS="${OPTIONAL_OS_DEP_CFLAGS} -I${HOMEBREW_PREFIX}/include"
312
+ CFLAGS="${CFLAGS} -I${HOMEBREW_PREFIX}/include"
313
+ LDFLAGS="${LDFLAGS} -L${HOMEBREW_PREFIX}/lib"
314
+ fi
315
;;
316
*)
317
build_target=linux
netdata-installer.sh
-21
@@ -28,27 +28,6 @@ if [ "${NETDATA_SOURCE_DIR}" != "${INSTALLER_DIR}" ] && [ "${INSTALLER_DIR}" !=
28
echo >&2 "Warning: you are currently in '${NETDATA_SOURCE_DIR}' but the installer is in '${INSTALLER_DIR}'."
29
fi
30
31
-# -----------------------------------------------------------------------------
32
-# Pull in OpenSSL properly if on macOS
33
-if [ "$(uname -s)" = 'Darwin' ]; then
34
- if brew --prefix > /dev/null 2>&1; then
35
- if brew --prefix --installed openssl > /dev/null 2>&1; then
36
- HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl)
37
- elif brew --prefix --installed openssl@3 > /dev/null 2>&1; then
38
- HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@3)
39
- elif brew --prefix --installed openssl@1.1 > /dev/null 2>&1; then
40
- HOMEBREW_OPENSSL_PREFIX=$(brew --prefix --installed openssl@1.1)
41
- fi
42
- if [ -n "${HOMEBREW_OPENSSL_PREFIX}" ]; then
43
- export CFLAGS="${CFLAGS} -I${HOMEBREW_OPENSSL_PREFIX}/include"
44
- export LDFLAGS="${LDFLAGS} -L${HOMEBREW_OPENSSL_PREFIX}/lib"
45
- fi
46
- HOMEBREW_PREFIX=$(brew --prefix)
47
- export CFLAGS="${CFLAGS} -I${HOMEBREW_PREFIX}/include"
48
- export LDFLAGS="${LDFLAGS} -L${HOMEBREW_PREFIX}/lib"
49
- fi
50
-fi
51
-
31
# -----------------------------------------------------------------------------
32
# reload the user profile
33