mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
d29722e6ff
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>
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
--- 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
|