Revert "Override linker and include paths for static builds. (#9311)" (#9343)
This reverts commit f81b19fc242a0e199e10f1d23e2a8adff967e48a.
Austin S. Hemmelgarn committed
Jun 16, 2020 at 14:48 UTC
36d5e40dca91a93963e4d96f07af3e38803615d0
6 files changed
+20
-42
netdata-installer.sh
+9
-28
@@ -235,7 +235,6 @@ while [ -n "${1}" ]; do
235
case "${1}" in
236
"--zlib-is-really-here") LIBS_ARE_HERE=1 ;;
237
"--libs-are-really-here") LIBS_ARE_HERE=1 ;;
238
- "--dont-scrub-cflags-even-though-it-may-break-things") DONT_SCRUB_CFLAGS_EVEN_THOUGH_IT_MAY_BREAK_THINGS=1 ;;
238
"--dont-start-it") DONOTSTART=1 ;;
239
"--dont-wait") DONOTWAIT=1 ;;
240
"--auto-update" | "-u") AUTOUPDATE=1 ;;
@@ -461,26 +460,20 @@ trap build_error EXIT
460
# -----------------------------------------------------------------------------
461
462
build_libmosquitto() {
464
- local env_cmd=''
465
-
466
- if [ -z "${DONT_SCRUB_CFLAGS_EVEN_THOUGH_IT_MAY_BREAK_THINGS}" ] ; then
467
- env_cmd="env CFLAGS= CXXFLAGS= LDFLAGS="
468
- fi
469
-
463
if [ "$(uname -s)" = Linux ]; then
471
- run ${env_cmd} make -C "${1}/lib"
464
+ run env CFLAGS= CXXFLAGS= LDFLAGS= make -C "${1}/lib"
465
else
466
pushd ${1} > /dev/null || return 1
467
if [ "$(uname)" = "Darwin" ] && [ -d /usr/local/opt/openssl ]; then
475
- run ${env_cmd} cmake \
468
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake \
469
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
470
-D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \
471
-D WITH_STATIC_LIBRARIES:boolean=YES \
472
.
473
else
481
- run ${env_cmd} cmake -D WITH_STATIC_LIBRARIES:boolean=YES .
474
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D WITH_STATIC_LIBRARIES:boolean=YES .
475
fi
483
- run ${env_cmd} make -C lib
476
+ run env CFLAGS= CXXFLAGS= LDFLAGS= make -C lib
477
run mv lib/libmosquitto_static.a lib/libmosquitto.a
478
popd || return 1
479
fi
@@ -541,23 +534,17 @@ bundle_libmosquitto
534
# -----------------------------------------------------------------------------
535
536
build_libwebsockets() {
544
- local env_cmd=''
545
-
546
- if [ -z "${DONT_SCRUB_CFLAGS_EVEN_THOUGH_IT_MAY_BREAK_THINGS}" ] ; then
547
- env_cmd="env CFLAGS= CXXFLAGS= LDFLAGS="
548
- fi
549
-
537
pushd "${1}" > /dev/null || exit 1
538
if [ "$(uname)" = "Darwin" ] && [ -d /usr/local/opt/openssl ]; then
552
- run ${env_cmd} cmake \
539
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake \
540
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
541
-D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \
542
-D LWS_WITH_SOCKS5:bool=ON \
543
.
544
else
558
- run ${env_cmd} cmake -D LWS_WITH_SOCKS5:bool=ON .
545
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -D LWS_WITH_SOCKS5:bool=ON .
546
fi
560
- run ${env_cmd} make
547
+ run env CFLAGS= CXXFLAGS= LDFLAGS= make
548
popd > /dev/null || exit 1
549
}
550
@@ -621,15 +608,9 @@ bundle_libwebsockets
608
# -----------------------------------------------------------------------------
609
610
build_jsonc() {
624
- local env_cmd=''
625
-
626
- if [ -z "${DONT_SCRUB_CFLAGS_EVEN_THOUGH_IT_MAY_BREAK_THINGS}" ] ; then
627
- env_cmd="env CFLAGS= CXXFLAGS= LDFLAGS="
628
- fi
629
-
611
pushd "${1}" > /dev/null || exit 1
631
- run ${env_cmd} cmake -DBUILD_SHARED_LIBS=OFF .
632
- run ${env_cmd} make
612
+ run env CFLAGS= CXXFLAGS= LDFLAGS= cmake -DBUILD_SHARED_LIBS=OFF .
613
+ run env CFLAGS= CXXFLAGS= LDFLAGS= make
614
popd > /dev/null || exit 1
615
}
616
packaging/makeself/install-alpine-packages.sh
+2
@@ -24,12 +24,14 @@ apk add --no-cache -U \
24
libtool \
25
pkgconfig \
26
util-linux-dev \
27
+ openssl-dev \
28
gnutls-dev \
29
zlib-dev \
30
libmnl-dev \
31
libnetfilter_acct-dev \
32
libuv-dev \
33
lz4-dev \
34
+ openssl-dev \
35
snappy-dev \
36
protobuf-dev \
37
binutils \
packaging/makeself/jobs/50-bash-4.4.18.install.sh
+1
-1
@@ -6,7 +6,7 @@
6
7
fetch "bash-4.4.18" "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz"
8
9
-export PKG_CONFIG_PATH="/opnessl-static/lib/pkgconfig"
9
+export PKG_CONFIG_PATH="/opnessl/lib/pkgconfig"
10
11
run ./configure \
12
--prefix="${NETDATA_INSTALL_PATH}" \
packaging/makeself/jobs/50-curl-7.60.0.install.sh
+2
-3
@@ -6,10 +6,9 @@
6
7
fetch "curl-curl-7_60_0" "https://github.com/curl/curl/archive/curl-7_60_0.tar.gz"
8
9
-export CFLAGS="-I/openssl-static/include"
10
-export LDFLAGS="-static -L/openssl-static/lib"
9
+export LDFLAGS="-static"
10
export PKG_CONFIG="pkg-config --static"
12
-export PKG_CONFIG_PATH="/opnessl-static/lib/pkgconfig"
11
+export PKG_CONFIG_PATH="/opnessl/lib/pkgconfig"
12
13
run ./buildconf
14
packaging/makeself/jobs/50-fping-4.2.install.sh
+2
-3
@@ -6,9 +6,8 @@
6
7
fetch "fping-4.2" "https://github.com/schweikert/fping/releases/download/v4.2/fping-4.2.tar.gz"
8
9
-export CFLAGS="-static -I/openssl-static/include"
10
-export LDFLAGS="-static -L/openssl-static/lib"
11
-export PKG_CONFIG_PATH="/opnessl-static/lib/pkgconfig"
9
+export CFLAGS="-static"
10
+export PKG_CONFIG_PATH="/opnessl/lib/pkgconfig"
11
12
run ./configure \
13
--prefix="${NETDATA_INSTALL_PATH}" \
packaging/makeself/jobs/70-netdata-git.install.sh
+4
-7
@@ -7,26 +7,23 @@
7
cd "${NETDATA_SOURCE_PATH}" || exit 1
8
9
if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]; then
10
- export CFLAGS="-static -O3 -I/openssl-static/include"
10
+ export CFLAGS="-static -O3"
11
else
12
- export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness -fstack-protector-all -D_FORTIFY_SOURCE=2 -DNETDATA_INTERNAL_CHECKS=1 -I/openssl-static/include"
12
+ export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness -fstack-protector-all -D_FORTIFY_SOURCE=2 -DNETDATA_INTERNAL_CHECKS=1"
13
fi
14
15
-export LDFLAGS="-static -L/openssl-static/lib"
16
-
15
# We export this to 'yes', installer sets this to .environment.
16
# The updater consumes this one, so that it can tell whether it should update a static install or a non-static one
17
export IS_NETDATA_STATIC_BINARY="yes"
18
19
# Set eBPF LIBC to "static" to bundle the `-static` variant of the kernel-collector
20
export EBPF_LIBC="static"
23
-export PKG_CONFIG_PATH="/opnessl-static/lib/pkgconfig"
21
+export PKG_CONFIG_PATH="/opnessl/lib/pkgconfig"
22
23
run ./netdata-installer.sh \
24
--install "${NETDATA_INSTALL_PARENT}" \
25
--dont-wait \
28
- --dont-start-it \
29
- --dont-scrub-cflags-even-though-it-may-break-things
26
+ --dont-start-it
27
28
# Remove the netdata.conf file from the tree. It has hard-coded sensible defaults builtin.
29
run rm -f "${NETDATA_INSTALL_PATH}/etc/netdata/netdata.conf"