From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baruch Siach Date: Thu, 05 Nov 2020 20:15:15 +0200 Subject: [Buildroot] [PATCH 1/1] package/libnetfilter_conntrack: add libmnl to Libs.Private In-Reply-To: <20200412122107.1071258-1-fontaine.fabrice@gmail.com> References: <20200412122107.1071258-1-fontaine.fabrice@gmail.com> Message-ID: <87eel7r7po.fsf@tarshish> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hi Fabrice, all, On Sun, Apr 12 2020, Fabrice Fontaine wrote: > This will fix a static build failure with dnsmasq on latest > libnetfilter_conntrack > > Fixes: > - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 > > Signed-off-by: Fabrice Fontaine > --- > ...ntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > > diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > new file mode 100644 > index 0000000000..921837df07 > --- /dev/null > +++ b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > @@ -0,0 +1,38 @@ > +From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 12 Apr 2020 14:05:15 +0200 > +Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private > + > +Since version 1.0.8 and commit > +c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends > +on libmnl so add it to Libs.Private. > + > +Otherwise, applications such as dnsmasq will fail to link on: > + > +/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink > +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': > +api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' > + > +Fixes: > + - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: sent to Pablo Neira Ayuso ] This patch is now upstream commit e94172f09e4d. Tested-by: Baruch Siach Thanks, baruch > +--- > + libnetfilter_conntrack.pc.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in > +index 857f993..fbd7132 100644 > +--- a/libnetfilter_conntrack.pc.in > ++++ b/libnetfilter_conntrack.pc.in > +@@ -12,5 +12,5 @@ Version: @VERSION@ > + Requires: libnfnetlink > + Conflicts: > + Libs: -L${libdir} -lnetfilter_conntrack > +-Libs.private: @LIBNFNETLINK_LIBS@ > ++Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ > + Cflags: -I${includedir} > +-- > +2.25.1 -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -