| Message ID | 20230425211139.518381-1-jeremy@azazel.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | de4773f0235acf74554f6a64ea60adc0d7b01895 |
| Headers | show |
| Series | [nf] selftests: netfilter: fix libmnl pkg-config usage | expand |
On Tuesday 2023-04-25 23:11, Jeremy Sowden wrote: >1. Don't hard-code pkg-config >2. Remove distro-specific default for CFLAGS >3. Use pkg-config for LDLIBS >+CFLAGS += $(shell $(HOSTPKG_CONFIG) --cflags libmnl 2>/dev/null) >+LDLIBS += $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl) Ah yes, this looks better and looks modeled upon selftests/bpf/Makefile. Speaking of which, there's a space missing over there. tools/testing/selftests/bpf/Makefile:HOSTPKG_CONFIG := pkg-config tools/testing/selftests/bpf/Makefile: $(Q)$(CC) $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null) \ tools/testing/selftests/bpf/Makefile: $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)
diff --git a/tools/testing/selftests/netfilter/Makefile b/tools/testing/selftests/netfilter/Makefile index 4504ee07be08..3686bfa6c58d 100644 --- a/tools/testing/selftests/netfilter/Makefile +++ b/tools/testing/selftests/netfilter/Makefile @@ -8,8 +8,11 @@ TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \ ipip-conntrack-mtu.sh conntrack_tcp_unreplied.sh \ conntrack_vrf.sh nft_synproxy.sh rpath.sh -CFLAGS += $(shell pkg-config --cflags libmnl 2>/dev/null || echo "-I/usr/include/libmnl") -LDLIBS = -lmnl +HOSTPKG_CONFIG := pkg-config + +CFLAGS += $(shell $(HOSTPKG_CONFIG) --cflags libmnl 2>/dev/null) +LDLIBS += $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl) + TEST_GEN_FILES = nf-queue connect_close include ../lib.mk
1. Don't hard-code pkg-config 2. Remove distro-specific default for CFLAGS 3. Use pkg-config for LDLIBS Fixes: a50a88f026fb ("selftests: netfilter: fix a build error on openSUSE") Suggested-by: Jan Engelhardt <jengelh@inai.de> Signed-off-by: Jeremy Sowden <jeremy@azazel.net> --- tools/testing/selftests/netfilter/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)