ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-04 04:54:18 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
c174c45c89
openwrt/package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch

21 lines
748 B
Diff
Raw Normal View History

iproute2: fix libbpf detection with NLS enabled Upstream iproute2 detects libbpf using a one-line $CC test-compile, which normally ignores LDFLAGS. With NLS enabled however, LDFLAGS includes an "rpath-link" linker option needed to resolve libintl.so. Its absence causes both the compile and libbpf detection to fail: ld: warning: libintl.so.8, needed by libbpf.so, not found (try using -rpath or -rpath-link) ld: libelf.so.1: undefined reference to `libintl_dgettext' collect2: error: ld returned 1 exit status Fix this by directly including $LDFLAGS in the test-compile command. Reported-by: Ian Cooper <iancooper@hotmail.com> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2021-03-27 12:43:03 +00:00
--- a/configure
+++ b/configure
iproute2: update to 6.9.0 Support for iptables action has been dropped. Remove tc-mod-iptables and related patch (175-reduce-dynamic-syms.patch). We also add the missing libbpf dependency for `ss` since iproute 8740ca9 ("ss: add support for BPF socket-local storage") now means that `ss` requires libbpf as well. Fix 170-ip_tiny.patch, as the help text didn't match all the included functions. Drop upstreamed patches 402-bpf-fix-warning-from-basename.patch and 403-bpf-include-libgen.h-for-basename.patch. All other patches automatically rebased. Co-authored-by: Rany Hany <rany_hany@riseup.net> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Rany Hany <rany_hany@riseup.net>
2024-05-25 15:30:25 +00:00
@@ -241,7 +241,7 @@ int main(int argc, char **argv) {
iproute2: fix libbpf detection with NLS enabled Upstream iproute2 detects libbpf using a one-line $CC test-compile, which normally ignores LDFLAGS. With NLS enabled however, LDFLAGS includes an "rpath-link" linker option needed to resolve libintl.so. Its absence causes both the compile and libbpf detection to fail: ld: warning: libintl.so.8, needed by libbpf.so, not found (try using -rpath or -rpath-link) ld: libelf.so.1: undefined reference to `libintl_dgettext' collect2: error: ld returned 1 exit status Fix this by directly including $LDFLAGS in the test-compile command. Reported-by: Ian Cooper <iancooper@hotmail.com> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2021-03-27 12:43:03 +00:00
}
EOF
- $CC -o $TMPDIR/libbpf_test $TMPDIR/libbpf_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS >/dev/null 2>&1
+ $CC -o $TMPDIR/libbpf_test $TMPDIR/libbpf_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS $LDFLAGS >/dev/null 2>&1
local ret=$?
rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
iproute2: update to 6.9.0 Support for iptables action has been dropped. Remove tc-mod-iptables and related patch (175-reduce-dynamic-syms.patch). We also add the missing libbpf dependency for `ss` since iproute 8740ca9 ("ss: add support for BPF socket-local storage") now means that `ss` requires libbpf as well. Fix 170-ip_tiny.patch, as the help text didn't match all the included functions. Drop upstreamed patches 402-bpf-fix-warning-from-basename.patch and 403-bpf-include-libgen.h-for-basename.patch. All other patches automatically rebased. Co-authored-by: Rany Hany <rany_hany@riseup.net> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Rany Hany <rany_hany@riseup.net>
2024-05-25 15:30:25 +00:00
@@ -259,7 +259,7 @@ int main(int argc, char **argv) {
iproute2: fix libbpf detection with NLS enabled Upstream iproute2 detects libbpf using a one-line $CC test-compile, which normally ignores LDFLAGS. With NLS enabled however, LDFLAGS includes an "rpath-link" linker option needed to resolve libintl.so. Its absence causes both the compile and libbpf detection to fail: ld: warning: libintl.so.8, needed by libbpf.so, not found (try using -rpath or -rpath-link) ld: libelf.so.1: undefined reference to `libintl_dgettext' collect2: error: ld returned 1 exit status Fix this by directly including $LDFLAGS in the test-compile command. Reported-by: Ian Cooper <iancooper@hotmail.com> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2021-03-27 12:43:03 +00:00
}
EOF
- $CC -o $TMPDIR/libbpf_sec_test $TMPDIR/libbpf_sec_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS >/dev/null 2>&1
+ $CC -o $TMPDIR/libbpf_sec_test $TMPDIR/libbpf_sec_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS $LDFLAGS >/dev/null 2>&1
local ret=$?
rm -f $TMPDIR/libbpf_sec_test.c $TMPDIR/libbpf_sec_test
Reference in New Issue Copy Permalink