Link statically libnetfilter_acct into our static builds (#14516)
Bundle the nfacct dependencies libnetfilter_acct as static lib from source archives and libmnl as static lib from the alpines' packages (regular package manager) into our Netdata static binaries Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud> Co-authored-by: Austin S. Hemmelgarn <ahferroin7@gmail.com>
Tasos Katsoulas committed
Mar 1, 2023 at 15:03 UTC
513452aa447759acecb16504673db7dce40ffaa2
4 files changed
+68
-18
configure.ac
+20
-11
@@ -952,17 +952,8 @@ AC_CHECK_HEADER(
952
[have_nfnetlink_conntrack=no]
953
)
954
955
-PKG_CHECK_MODULES(
956
- [NFACCT],
957
- [libnetfilter_acct],
958
- [AC_CHECK_LIB(
959
- [netfilter_acct],
960
- [nfacct_alloc],
961
- [have_libnetfilter_acct=yes],
962
- [have_libnetfilter_acct=no]
963
- )],
964
- [have_libnetfilter_acct=no]
965
-)
955
+LIBS_BAK="${LIBS}"
956
+LIBS="${LIBS} -lmnl"
957
958
PKG_CHECK_MODULES(
959
[LIBMNL],
@@ -976,6 +967,24 @@ PKG_CHECK_MODULES(
967
[have_libmnl=no]
968
)
969
970
+
971
+LIBS="${LIBS}"
972
+
973
+PKG_CHECK_MODULES(
974
+ [NFACCT],
975
+ [libnetfilter_acct],
976
+ AC_SEARCH_LIBS(
977
+ [nfacct_alloc],
978
+ [netfilter_acct libnetfilter_acct],
979
+ [have_libnetfilter_acct=yes],
980
+ [have_libnetfilter_acct=no],
981
+ [${LIBS} -L/libnetfilter-acct-static/lib/libnetfilter_acct.a]
982
+ )],
983
+ [have_libnetfilter_acct=no]
984
+)
985
+
986
+LIBS="${LIBS_BAK}"
987
+
988
test "${enable_plugin_nfacct}" = "yes" -a "${have_nfnetlink_conntrack}" != "yes" && \
989
AC_MSG_ERROR([nfnetlink_conntrack.h required but not found or too old])
990
packaging/makeself/functions.sh
+4
-3
@@ -30,7 +30,8 @@ set -euo pipefail
30
31
fetch() {
32
local dir="${1}" url="${2}" sha256="${3}" key="${4}"
33
- local tar="${dir}.tar.gz"
33
+ local tar
34
+ tar="$(basename "${2}")"
35
local cache="${NETDATA_SOURCE_PATH}/artifacts/cache/${BUILDARCH}/${key}"
36
37
if [ -d "${NETDATA_MAKESELF_PATH}/tmp/${dir}" ]; then
@@ -58,10 +59,10 @@ fetch() {
59
echo >&2 "expected: ${sha256}, got $(sha256sum "${NETDATA_MAKESELF_PATH}/tmp/${tar}")"
60
exit 1
61
fi
61
- set -e
62
63
+ set -e
64
cd "${NETDATA_MAKESELF_PATH}/tmp"
64
- run tar -zxpf "${tar}"
65
+ run tar -axpf "${tar}"
66
cd -
67
68
CACHE_HIT=0
packaging/makeself/jobs/50-libnetfilter_acct-1.0.3.install.sh
new
+39
@@ -0,0 +1,39 @@
1
+#!/usr/bin/env bash
2
+# SPDX-License-Identifier: GPL-3.0-or-later
3
+#
4
+# Install the libnetfilter_acct and it's dependency libmnl
5
+#
6
+
7
+# shellcheck source=packaging/makeself/functions.sh
8
+. "$(dirname "${0}")/../functions.sh" "${@}" || exit 1
9
+
10
+version="1.0.3"
11
+
12
+# shellcheck disable=SC2015
13
+[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::building libnetfilter_acct" || true
14
+
15
+export CFLAGS="-static -I/usr/include/libmnl -pipe"
16
+export LDFLAGS="-static -L/usr/lib -lmnl"
17
+export PKG_CONFIG="pkg-config --static"
18
+export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
19
+
20
+fetch "libnetfilter_acct-${version}" "https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-${version}.tar.bz2" \
21
+ 4250ceef3efe2034f4ac05906c3ee427db31b9b0a2df41b2744f4bf79a959a1a libnetfilter_acct
22
+
23
+
24
+if [ "${CACHE_HIT:-0}" -eq 0 ]; then
25
+ run ./configure \
26
+ --prefix="/libnetfilter-acct-static" \
27
+ --exec-prefix="/libnetfilter-acct-static"
28
+
29
+ run make clean
30
+ run make -j "$(nproc)"
31
+fi
32
+
33
+run make install
34
+
35
+store_cache libnetfilter_acct "${NETDATA_MAKESELF_PATH}/tmp/libnetfilter_acct-${version}"
36
+
37
+
38
+# shellcheck disable=SC2015
39
+[ "${GITHUB_ACTIONS}" = "true" ] && echo "::endgroup::" || true
packaging/makeself/jobs/70-netdata-git.install.sh
+5
-4
@@ -7,12 +7,12 @@
7
cd "${NETDATA_SOURCE_PATH}" || exit 1
8
9
if [ "${NETDATA_BUILD_WITH_DEBUG}" -eq 0 ]; then
10
- export CFLAGS="-static -O2 -I/openssl-static/include -pipe"
10
+ export CFLAGS="-static -O2 -I/openssl-static/include -I/libnetfilter-acct-static/include/libnetfilter_acct -I/usr/include/libmnl -pipe"
11
else
12
- export CFLAGS="-static -O1 -pipe -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 -pipe -ggdb -Wall -Wextra -Wformat-signedness -fstack-protector-all -D_FORTIFY_SOURCE=2 -DNETDATA_INTERNAL_CHECKS=1 -I/openssl-static/include -I/libnetfilter-acct-static/include/libnetfilter_acct -I/usr/include/libmnl"
13
fi
14
15
-export LDFLAGS="-static -L/openssl-static/lib"
15
+export LDFLAGS="-static -L/openssl-static/lib -L/libnetfilter-acct-static/lib -lnetfilter_acct -L/usr/lib -lmnl"
16
17
# We export this to 'yes', installer sets this to .environment.
18
# The updater consumes this one, so that it can tell whether it should update a static install or a non-static one
@@ -20,7 +20,8 @@ export IS_NETDATA_STATIC_BINARY="yes"
20
21
# Set eBPF LIBC to "static" to bundle the `-static` variant of the kernel-collector
22
export EBPF_LIBC="static"
23
-export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
23
+export PKG_CONFIG="pkg-config --static"
24
+export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig:/libnetfilter-acct-static/lib/pkgconfig:/usr/lib/pkgconfig"
25
26
# Set correct CMake flags for building against non-System OpenSSL
27
# See: https://github.com/warmcat/libwebsockets/blob/master/READMEs/README.build.md