1From b3c61360a93b7f08fc9c33526056211408301ea9 Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Mon, 23 Nov 2020 21:16:38 +0100 4Subject: [PATCH] configure.ac: use pkg-config to find netfilter_conntrack 5 6Use pkg-config to retrieve the dependencies of netfilter_conntrack 7and avoid the following build failure when building statically: 8 9configure:13096: /data/buildroot-test/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -I/data/buildroot-test/instance-1/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include -DPCRE_STATIC -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -L/data/buildroot-test/instance-1/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib conftest.c -lnetfilter_conntrack -lnfnetlink -lev -lcares -lsodium -lmbedcrypto -lpcre >&5 10/data/buildroot-test/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /data/buildroot-test/instance-1/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': 11api.c:(.text+0x3f): undefined reference to `mnl_nlmsg_put_header' 12 13Fixes: 14 - http://autobuild.buildroot.org/results/6cad497a7ab941a0ee3fd7007defc81e30cdcbe0 15 16Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 17[Upstream status: 18https://github.com/shadowsocks/shadowsocks-libev/pull/2773] 19--- 20 configure.ac | 5 +++-- 21 src/Makefile.am | 2 +- 22 2 files changed, 4 insertions(+), 3 deletions(-) 23 24diff --git a/configure.ac b/configure.ac 25index 9787bc2..207c041 100755 26--- a/configure.ac 27+++ b/configure.ac 28@@ -252,7 +252,8 @@ AC_ARG_ENABLE(connmarktos, 29 if test x"$enable_connmarktos" = "xyes" ; then 30 AC_MSG_NOTICE([Linux Netfilter Conntrack support requested by --enable-connmarktos: ${enable_connmarktos}]) 31 if test "x$enable_connmarktos" != "xno"; then 32- AC_SEARCH_LIBS([nfct_query], [netfilter_conntrack],,[ 33+ PKG_CHECK_MODULES([NETFILTER_CONNTRACK], [libnetfilter_conntrack],, 34+ [AC_SEARCH_LIBS([nfct_query], [netfilter_conntrack],,[ 35 if test x"$enable_connmarktos" = "xyes"; then 36 AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack library not found]) 37 fi 38@@ -262,7 +263,7 @@ if test x"$enable_connmarktos" = "xyes" ; then 39 if test x"$enable_connmarktos" = "xyes"; then 40 AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack headers not found]) 41 fi 42- with_netfilter_conntrack=no]) 43+ with_netfilter_conntrack=no])]) 44 # If nothing is broken; enable the libraries usage. 45 if test "x$with_netfilter_conntrack" != "xno"; then 46 with_netfilter_conntrack=yes 47diff --git a/src/Makefile.am b/src/Makefile.am 48index c261ed0..b81ced7 100644 49--- a/src/Makefile.am 50+++ b/src/Makefile.am 51@@ -9,7 +9,7 @@ AM_CFLAGS += -I$(top_srcdir)/libcork/include 52 endif 53 AM_CFLAGS += $(LIBPCRE_CFLAGS) 54 55-SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS) 56+SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS) $(NETFILTER_CONNTRACK_LIBS) 57 if !USE_SYSTEM_SHARED_LIB 58 SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la \ 59 $(top_builddir)/libipset/libipset.la \ 60-- 612.29.2 62 63