[PATCH libnetfilter_log 0/2] build: a couple of `-lnfnetlink` fixes.

[PATCH libnetfilter_log 0/2] build: a couple of `-lnfnetlink` fixes.

[Jeremy Sowden]

Building libnetfilter_log.so passes `-lnfnetlink` to the linker twice and
building libnetfilter_log_libipulog.so doesn't pass it at all.

Jeremy Sowden (2):
  build: remove duplicate `-lnfnetlink` from LDFLAGS.
  build: link libnetfilter_log_libipulog.so explicitly to
    libnfnetlink.so.

 src/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.29.2

[PATCH libnetfilter_log 1/2] build: remove duplicate `-lnfnetlink` from LDFLAGS.

[Jeremy Sowden]

`$(libnetfilter_log_la_LIBADD)` includes `$(LIBNFNETLINK_LIBS)`, so there's no
need to include `-lnfnetlink` in `$(libnetfilter_log_la_LDFLAGS)`.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index aa561525585c..33be04828223 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ include ${top_srcdir}/Make_global.am
 
 lib_LTLIBRARIES = libnetfilter_log.la
 
-libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink	\
+libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles	\
 			      -version-info $(LIBVERSION)
 libnetfilter_log_la_SOURCES = libnetfilter_log.c nlmsg.c
 libnetfilter_log_la_LIBADD  = ${LIBNFNETLINK_LIBS} ${LIBMNL_LIBS}
-- 
2.29.2

[PATCH libnetfilter_log 2/2] build: link libnetfilter_log_libipulog.so explicitly to libnfnetlink.so.

[Jeremy Sowden]

It uses symbols from libnfnetlink.so, but doesn't link to it, relying on an
implicit transitive linkage through libnetfilter_log.so.  Add
`$(LIBNFNETLINK_LIBS)` to `$(libnetfilter_log_libipulog_la_LIBADD)`.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 33be04828223..335c393f760a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,6 @@ lib_LTLIBRARIES += libnetfilter_log_libipulog.la
 
 libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles	\
 					-version-info 1:0:0
-libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la
+libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la ${LIBNFNETLINK_LIBS}
 libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
 endif
-- 
2.29.2

Re: [PATCH libnetfilter_log 0/2] build: a couple of `-lnfnetlink` fixes.

[Florian Westphal]

Jeremy Sowden <jeremy@azazel.net> wrote:
> Building libnetfilter_log.so passes `-lnfnetlink` to the linker twice and
> building libnetfilter_log_libipulog.so doesn't pass it at all.
> 
> Jeremy Sowden (2):
>   build: remove duplicate `-lnfnetlink` from LDFLAGS.
>   build: link libnetfilter_log_libipulog.so explicitly to
>     libnfnetlink.so.

Applied, thanks.