archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-30 07:30:04 +00:00
Code Issues Projects Releases Wiki Activity

Use glibtoolize on macOS instead of regular libtoolize. ()

Browse source 
* Use `glibtoolize` on macOS instead of regular `libtoolize`.

This ensures we get the version from Homebrew instead of the version
from XCode.

* Update install documentation for macOS.
This commit is contained in:
Austin S. Hemmelgarn 2020-12-08 11:51:46 -05:00 • committed by GitHub
parent 63e91d3459
commit 1526cb77ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
netdata-installer.sh
packaging/installer/methods
macos.md

7
netdata-installer.sh
View file

@ -716,13 +716,18 @@ bundle_libwebsockets
build_judy() { build_judy() {
local env_cmd='' local env_cmd=''
local libtoolize="libtoolize"
if [ -z "${DONT_SCRUB_CFLAGS_EVEN_THOUGH_IT_MAY_BREAK_THINGS}" ]; then if [ -z "${DONT_SCRUB_CFLAGS_EVEN_THOUGH_IT_MAY_BREAK_THINGS}" ]; then
env_cmd="env CFLAGS=-fPIC CXXFLAGS= LDFLAGS=" env_cmd="env CFLAGS=-fPIC CXXFLAGS= LDFLAGS="
fi fi
if [ "$(uname)" = "Darwin" ]; then
libtoolize="glibtoolize"
fi
pushd "${1}" > /dev/null || return 1 pushd "${1}" > /dev/null || return 1
if run ${env_cmd} libtoolize --force --copy && if run ${env_cmd} ${libtoolize} --force --copy &&
run ${env_cmd} aclocal && run ${env_cmd} aclocal &&
run ${env_cmd} autoheader && run ${env_cmd} autoheader &&
run ${env_cmd} automake --add-missing --force --copy --include-deps && run ${env_cmd} automake --add-missing --force --copy --include-deps &&

2
packaging/installer/methods/macos.md
View file

@ -53,7 +53,7 @@ Click **Install** on the Software Update popup window that appears. Then, use th
to install some of Netdata's prerequisites. to install some of Netdata's prerequisites.
```bash ```bash
brew install ossp-uuid autoconf automake pkg-config libuv lz4 json-c openssl@1.1 brew install ossp-uuid autoconf automake pkg-config libuv lz4 json-c openssl@1.1 libtool
``` ```
If you want to use the [database engine](/database/engine/README.md) to store your metrics, you need to download If you want to use the [database engine](/database/engine/README.md) to store your metrics, you need to download