Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xdp-tools: fix build with NLS enabled

Browse source 
Make sure the 'configure' shell script finds the libintl when linking
the test programs for discovering libpcap and libbpf.

Reported-by: @trippleflux
Fixes: 6ad1bea2a6 ("xdp-tools: add package")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2022-07-06 22:20:25 +01:00
parent 8288a4bbb3
commit d29722e6ff
No known key found for this signature in database
GPG key ID: 5A8F39C31C3217CA
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
package/network/utils/xdp-tools/Makefile
View file

@ -16,6 +16,7 @@ PKG_FLAGS:=nonshared
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/bpf.mk include $(INCLUDE_DIR)/bpf.mk
include $(INCLUDE_DIR)/nls.mk
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -76,6 +77,8 @@ define Package/xdpdump/description
xdpdump - a simple tcpdump like tool for capturing packets at the XDP layer xdpdump - a simple tcpdump like tool for capturing packets at the XDP layer
endef endef
TARGET_LDFLAGS += $(INTL_LDFLAGS)
CONFIGURE_VARS += \ CONFIGURE_VARS += \
FORCE_SYSTEM_LIBBPF=1 \ FORCE_SYSTEM_LIBBPF=1 \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \

29
package/network/utils/xdp-tools/patches/010-configure-respect-LDFLAGS.patch Normal file
View file

@ -0,0 +1,29 @@
--- a/configure
+++ b/configure
@@ -138,7 +138,7 @@ int main(int argc, char **argv) {
return 0;
}
EOF
- libpcap_err=$($CC -o $TMPDIR/libpcaptest $TMPDIR/libpcaptest.c $LIBPCAP_CFLAGS $LIBPCAP_LDLIBS 2>&1)
+ libpcap_err=$($CC -o $TMPDIR/libpcaptest $TMPDIR/libpcaptest.c $LIBPCAP_CFLAGS $LIBPCAP_LDLIBS $LDFLAGS 2>&1)
if [ "$?" -eq "0" ]; then
echo "HAVE_PCAP:=y" >>$CONFIG
[ -n "$LIBPCAP_CFLAGS" ] && echo 'CFLAGS += ' $LIBPCAP_CFLAGS >> $CONFIG
@@ -186,7 +186,7 @@ int main(int argc, char **argv) {
return 0;
}
EOF
- libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
+ libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS $LDFLAGS 2>&1)
if [ "$?" -eq "0" ]; then
echo "HAVE_FEATURES+=${config_var}" >>"$CONFIG"
echo "yes"
@@ -253,7 +253,7 @@ int main(int argc, char **argv) {
}
EOF
- libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
+ libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS $LDFLAGS 2>&1)
if [ "$?" -eq "0" ]; then
echo "SYSTEM_LIBBPF:=y" >>$CONFIG
echo "LIBBPF_VERSION=$LIBBPF_VERSION" >>$CONFIG