Revert "Override linker and include paths for static builds. (#9311)" (#9343)

This reverts commit f81b19fc242a0e199e10f1d23e2a8adff967e48a.

4 files changed, 9 insertions, 14 deletions

diff --git a/packaging/makeself/jobs/50-bash-4.4.18.install.sh b/packaging/makeself/jobs/50-bash-4.4.18.install.sh
index 78ef01006d..f40ad333bb 100755
--- a/packaging/makeself/jobs/50-bash-4.4.18.install.sh
+++ b/packaging/makeself/jobs/50-bash-4.4.18.install.sh
@@ -6,7 +6,7 @@
 
 fetch "bash-4.4.18" "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz"
 
-export PKG_CONFIG_PATH="/opnessl-static/lib/pkgconfig"
+export PKG_CONFIG_PATH="/opnessl/lib/pkgconfig"
 
 run ./configure \
   --prefix="${NETDATA_INSTALL_PATH}" \
diff --git a/packaging/makeself/jobs/50-curl-7.60.0.install.sh b/packaging/makeself/jobs/50-curl-7.60.0.install.sh
index 5c8e7e65ef..f55829b5b8 100755
--- a/packaging/makeself/jobs/50-curl-7.60.0.install.sh
+++ b/packaging/makeself/jobs/50-curl-7.60.0.install.sh
@@ -6,10 +6,9 @@
 
 fetch "curl-curl-7_60_0" "https://github.com/curl/curl/archive/curl-7_60_0.tar.gz"
 
-export CFLAGS="-I/openssl-static/include"
-export LDFLAGS="-static -L/openssl-static/lib"
+export LDFLAGS="-static"
 export PKG_CONFIG="pkg-config --static"
-export PKG_CONFIG_PATH="/opnessl-static/lib/pkgconfig"
+export PKG_CONFIG_PATH="/opnessl/lib/pkgconfig"
 
 run ./buildconf
 
diff --git a/packaging/makeself/jobs/50-fping-4.2.install.sh b/packaging/makeself/jobs/50-fping-4.2.install.sh
index 72ace60100..e9212c8db7 100755
--- a/packaging/makeself/jobs/50-fping-4.2.install.sh
+++ b/packaging/makeself/jobs/50-fping-4.2.install.sh
@@ -6,9 +6,8 @@
 
 fetch "fping-4.2" "https://github.com/schweikert/fping/releases/download/v4.2/fping-4.2.tar.gz"
 
-export CFLAGS="-static -I/openssl-static/include"
-export LDFLAGS="-static -L/openssl-static/lib"
-export PKG_CONFIG_PATH="/opnessl-static/lib/pkgconfig"
+export CFLAGS="-static"
+export PKG_CONFIG_PATH="/opnessl/lib/pkgconfig"
 
 run ./configure \
   --prefix="${NETDATA_INSTALL_PATH}" \
diff --git a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh
index e822928dc6..6a1bedcc33 100755
--- a/packaging/makeself/jobs/70-netdata-git.install.sh
+++ b/packaging/makeself/jobs/70-netdata-git.install.sh
@@ -7,26 +7,23 @@
 cd "${NETDATA_SOURCE_PATH}" || exit 1
 
 if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]; then
-  export CFLAGS="-static -O3 -I/openssl-static/include"
+  export CFLAGS="-static -O3"
 else
-  export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness -fstack-protector-all -D_FORTIFY_SOURCE=2 -DNETDATA_INTERNAL_CHECKS=1 -I/openssl-static/include"
+  export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness -fstack-protector-all -D_FORTIFY_SOURCE=2 -DNETDATA_INTERNAL_CHECKS=1"
 fi
 
-export LDFLAGS="-static -L/openssl-static/lib"
-
 # We export this to 'yes', installer sets this to .environment.
 # The updater consumes this one, so that it can tell whether it should update a static install or a non-static one
 export IS_NETDATA_STATIC_BINARY="yes"
 
 # Set eBPF LIBC to "static" to bundle the `-static` variant of the kernel-collector
 export EBPF_LIBC="static"
-export PKG_CONFIG_PATH="/opnessl-static/lib/pkgconfig"
+export PKG_CONFIG_PATH="/opnessl/lib/pkgconfig"
 
 run ./netdata-installer.sh \
   --install "${NETDATA_INSTALL_PARENT}" \
   --dont-wait \
-  --dont-start-it \
-  --dont-scrub-cflags-even-though-it-may-break-things
+  --dont-start-it
 
 # Remove the netdata.conf file from the tree. It has hard-coded sensible defaults builtin.
 run rm -f "${NETDATA_INSTALL_PATH}/etc/netdata/netdata.conf"