diff options
| author | Timotej S <6674623+underhood@users.noreply.github.com> | 2020-10-30 10:28:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 10:28:28 +0100 |
| commit | 593e1b6dbc6c979955e503d431d32c0dce1a2e09 (patch) | |
| tree | a38bfeef83a57bd3922b65dd23dacc3dd5708ff3 /netdata-installer.sh | |
| parent | 2e2a855935fce6ad9025e81ed479bdbc883d197d (diff) | |
allows use of system libwebsockets instead of bundled one (#9984)
* allows usage of system libwebsockets
* fixes problems that were preventing ACLK to work with LWS `4.1.`
* add LWS info to buildinfo
Co-authored-by: Austin S. Hemmelgarn <austin@netdata.cloud>
Diffstat (limited to 'netdata-installer.sh')
| -rwxr-xr-x | netdata-installer.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/netdata-installer.sh b/netdata-installer.sh index d84b2b44d3..d529e38c04 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -234,6 +234,7 @@ USAGE: ${PROGRAM} [options] --enable-lto Enable Link-Time-Optimization. Default: enabled --disable-lto --disable-x86-sse Disable SSE instructions. By default SSE optimizations are enabled. + --use-system-lws Use a system copy of libwebsockets instead of bundling our own (default is to use the bundled copy). --zlib-is-really-here or --libs-are-really-here If you get errors about missing zlib or libuuid but you know it is available, you might have a broken pkg-config. Use this option to proceed without checking pkg-config. @@ -275,6 +276,7 @@ while [ -n "${1}" ]; do case "${1}" in "--zlib-is-really-here") LIBS_ARE_HERE=1 ;; "--libs-are-really-here") LIBS_ARE_HERE=1 ;; + "--use-system-lws") USE_SYSTEM_LWS=1 ;; "--dont-scrub-cflags-even-though-it-may-break-things") DONT_SCRUB_CFLAGS_EVEN_THOUGH_IT_MAY_BREAK_THINGS=1 ;; "--dont-start-it") DONOTSTART=1 ;; "--dont-wait") DONOTWAIT=1 ;; @@ -641,7 +643,7 @@ copy_libwebsockets() { } bundle_libwebsockets() { - if [ -n "${NETDATA_DISABLE_CLOUD}" ]; then + if [ -n "${NETDATA_DISABLE_CLOUD}" ] || [ -n "${USE_SYSTEM_LWS}" ]; then return 0 fi @@ -668,6 +670,7 @@ bundle_libwebsockets() { copy_libwebsockets "${tmp}/libwebsockets-${LIBWEBSOCKETS_PACKAGE_VERSION}" && rm -rf "${tmp}"; then run_ok "libwebsockets built and prepared." + NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS} --with-bundled-lws=externaldeps/libwebsockets" else run_failed "Failed to build libwebsockets." if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then |