* [libnetfilter_log PATCH 1/9] build: correct pkg-config dependency configuration
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 2/9] build: add pkg-config configuration for libipulog Jeremy Sowden
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
Put libnfnetlink and libmnl in `Requires.private`. They both use
pkg-config (thus `Requires`, not `Libs`), and they are both required for
static builds, but do not need to be exposed otherwise (thus
`Requires.private`).
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 7 +++++--
libnetfilter_log.pc.in | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index c914e00a8ffe..8360e91063ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,11 @@ AC_ARG_WITH([ipulog],
AM_CONDITIONAL([BUILD_IPULOG], [test "x$with_ipulog" != xno])
dnl Dependencies
-PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
-PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
+AC_SUBST([LIBNFNETLINK_MIN_VERSION], [0.0.41])
+AC_SUBST([LIBMNL_MIN_VERSION], [1.0.3])
+
+PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= ${LIBNFNETLINK_MIN_VERSION}])
+PKG_CHECK_MODULES([LIBMNL], [libmnl >= ${LIBMNL_MIN_VERSION}])
PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2],
[HAVE_LNFCT=1], [HAVE_LNFCT=0])
AM_CONDITIONAL([BUILD_NFCT], [test "$HAVE_LNFCT" -eq 1])
diff --git a/libnetfilter_log.pc.in b/libnetfilter_log.pc.in
index a4b2f3bd4f70..9dbed7709632 100644
--- a/libnetfilter_log.pc.in
+++ b/libnetfilter_log.pc.in
@@ -6,11 +6,11 @@ libdir=@libdir@
includedir=@includedir@
Name: libnetfilter_log
-Description: netfilter userspace packet logging library
+Description: Netfilter userspace packet logging library
URL: http://netfilter.org/projects/libnetfilter_log/
Version: @VERSION@
-Requires: libnfnetlink
+Requires.private: libnfnetlink >= @LIBNFNETLINK_MIN_VERSION@,
+ libmnl >= @LIBMNL_MIN_VERSION@
Conflicts:
Libs: -L${libdir} -lnetfilter_log
-Libs.private: @LIBNFNETLINK_LIBS@
Cflags: -I${includedir}
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [libnetfilter_log PATCH 2/9] build: add pkg-config configuration for libipulog
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 1/9] build: correct pkg-config dependency configuration Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 3/9] build: fix linker flags for nf-log Jeremy Sowden
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
Put libnfnetlink and libnetfilter_log in `Requires.private`. They both
use pkg-config (thus `Requires`, not `Libs`), and they are both required
for static builds, but do not need to be exposed otherwise (thus
`Requires.private`).
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
Makefile.am | 2 +-
configure.ac | 11 ++++++++---
libnetfilter_log_libipulog.pc.in | 16 ++++++++++++++++
3 files changed, 25 insertions(+), 4 deletions(-)
create mode 100644 libnetfilter_log_libipulog.pc.in
diff --git a/Makefile.am b/Makefile.am
index 2a9cdd826dae..c7b86f77aee6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,4 +5,4 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = Make_global.am
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libnetfilter_log.pc
+pkgconfig_DATA = libnetfilter_log.pc libnetfilter_log_libipulog.pc
diff --git a/configure.ac b/configure.ac
index 8360e91063ae..1723426aa0c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,12 @@ PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2],
AM_CONDITIONAL([BUILD_NFCT], [test "$HAVE_LNFCT" -eq 1])
dnl Output the makefile
-AC_CONFIG_FILES([Makefile src/Makefile include/Makefile
- include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc
- doxygen.cfg])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ include/Makefile
+ include/libnetfilter_log/Makefile
+ utils/Makefile
+ libnetfilter_log.pc
+ libnetfilter_log_libipulog.pc
+ doxygen.cfg])
AC_OUTPUT
diff --git a/libnetfilter_log_libipulog.pc.in b/libnetfilter_log_libipulog.pc.in
new file mode 100644
index 000000000000..1b7d17a0ac62
--- /dev/null
+++ b/libnetfilter_log_libipulog.pc.in
@@ -0,0 +1,16 @@
+# libnetfilter_log_libipulog pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libnetfilter_log_libipulog
+Description: Netfilter ULOG userspace compat library
+URL: http://netfilter.org/projects/libnetfilter_log/
+Version: @VERSION@
+Requires.private: libnetfilter_log >= @VERSION@,
+ libnfnetlink >= @LIBNFNETLINK_MIN_VERSION@
+Conflicts:
+Libs: -L${libdir} -lnetfilter_log_libipulog
+Cflags: -I${includedir}
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [libnetfilter_log PATCH 3/9] build: fix linker flags for nf-log
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 1/9] build: correct pkg-config dependency configuration Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 2/9] build: add pkg-config configuration for libipulog Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 4/9] build: move dependency CFLAGS variables out of `AM_CPPFLAGS` Jeremy Sowden
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
Use pkg-config LIBS variable for libmnl, instead of literal `-lmnl`.
Append `$(LIBNETFILTER_CONNTRACK_LIBS)` to nf_log_LDADD.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
utils/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 4afd91b0756d..39abb3e00af9 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -7,10 +7,10 @@ nfulnl_test_LDADD = ../src/libnetfilter_log.la
nfulnl_test_LDFLAGS = -dynamic
nf_log_SOURCES = nf-log.c
-nf_log_LDADD = ../src/libnetfilter_log.la -lmnl
+nf_log_LDADD = ../src/libnetfilter_log.la $(LIBMNL_LIBS)
nf_log_LDFLAGS = -dynamic
if BUILD_NFCT
-nf_log_LDFLAGS += $(LIBNETFILTER_CONNTRACK_LIBS)
+nf_log_LDADD += $(LIBNETFILTER_CONNTRACK_LIBS)
nf_log_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNETFILTER_CONNTRACK_CFLAGS} -DBUILD_NFCT
endif
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [libnetfilter_log PATCH 4/9] build: move dependency CFLAGS variables out of `AM_CPPFLAGS`
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
` (2 preceding siblings ...)
2021-10-09 11:38 ` [libnetfilter_log PATCH 3/9] build: fix linker flags for nf-log Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 5/9] build: remove superfluous .la when linking ulog_test Jeremy Sowden
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
`${LIBNFNETLINK_CFLAGS}` and `${LIBMNL_CFLAGS}` are not required for all
libraries and executables: include them only where necessary.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
Make_global.am | 2 +-
src/Makefile.am | 18 ++++++++++--------
utils/Makefile.am | 11 ++++++-----
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Make_global.am b/Make_global.am
index 9bc8ea1d7f67..4d5bec913af2 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -1,2 +1,2 @@
-AM_CPPFLAGS = -I${top_srcdir}/include ${LIBNFNETLINK_CFLAGS} ${LIBMNL_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/include
AM_CFLAGS = -Wall
diff --git a/src/Makefile.am b/src/Makefile.am
index 815d9d31cfc0..203ca0c3cdc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,16 +25,18 @@ include ${top_srcdir}/Make_global.am
lib_LTLIBRARIES = libnetfilter_log.la
-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}
+libnetfilter_log_la_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNFNETLINK_CFLAGS} ${LIBMNL_CFLAGS}
+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}
if BUILD_IPULOG
lib_LTLIBRARIES += libnetfilter_log_libipulog.la
-libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \
- -version-info $(IPULOG_LIBVERSION)
-libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la ${LIBNFNETLINK_LIBS}
-libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
+libnetfilter_log_libipulog_la_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNFNETLINK_CFLAGS}
+libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \
+ -version-info $(IPULOG_LIBVERSION)
+libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la ${LIBNFNETLINK_LIBS}
+libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
endif
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 39abb3e00af9..133b6ec550cf 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -6,12 +6,13 @@ nfulnl_test_SOURCES = nfulnl_test.c
nfulnl_test_LDADD = ../src/libnetfilter_log.la
nfulnl_test_LDFLAGS = -dynamic
-nf_log_SOURCES = nf-log.c
-nf_log_LDADD = ../src/libnetfilter_log.la $(LIBMNL_LIBS)
-nf_log_LDFLAGS = -dynamic
+nf_log_SOURCES = nf-log.c
+nf_log_LDADD = ../src/libnetfilter_log.la $(LIBMNL_LIBS)
+nf_log_LDFLAGS = -dynamic
+nf_log_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMNL_CFLAGS)
if BUILD_NFCT
-nf_log_LDADD += $(LIBNETFILTER_CONNTRACK_LIBS)
-nf_log_CPPFLAGS = ${AM_CPPFLAGS} ${LIBNETFILTER_CONNTRACK_CFLAGS} -DBUILD_NFCT
+nf_log_LDADD += $(LIBNETFILTER_CONNTRACK_LIBS)
+nf_log_CPPFLAGS += $(LIBNETFILTER_CONNTRACK_CFLAGS) -DBUILD_NFCT
endif
if BUILD_IPULOG
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [libnetfilter_log PATCH 5/9] build: remove superfluous .la when linking ulog_test
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
` (3 preceding siblings ...)
2021-10-09 11:38 ` [libnetfilter_log PATCH 4/9] build: move dependency CFLAGS variables out of `AM_CPPFLAGS` Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 6/9] build: remove `-dynamic` when linking check progs Jeremy Sowden
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
Explicit linkage to libnetfilter_log is not required.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
utils/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 133b6ec550cf..7b9d479382ea 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -19,6 +19,6 @@ if BUILD_IPULOG
check_PROGRAMS += ulog_test
ulog_test_SOURCES = ulog_test.c
-ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ../src/libnetfilter_log.la
+ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la
ulog_test_LDFLAGS = -dynamic
endif
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [libnetfilter_log PATCH 6/9] build: remove `-dynamic` when linking check progs
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
` (4 preceding siblings ...)
2021-10-09 11:38 ` [libnetfilter_log PATCH 5/9] build: remove superfluous .la when linking ulog_test Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 7/9] build: replace `AM_PROG_LIBTOOL` and `AC_DISABLE_STATIC` with `LT_INIT` Jeremy Sowden
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
The `-dynamic` flag is only meaningful for Darwin.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
utils/Makefile.am | 3 ---
1 file changed, 3 deletions(-)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 7b9d479382ea..94afb26180ed 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -4,11 +4,9 @@ check_PROGRAMS = nfulnl_test nf-log
nfulnl_test_SOURCES = nfulnl_test.c
nfulnl_test_LDADD = ../src/libnetfilter_log.la
-nfulnl_test_LDFLAGS = -dynamic
nf_log_SOURCES = nf-log.c
nf_log_LDADD = ../src/libnetfilter_log.la $(LIBMNL_LIBS)
-nf_log_LDFLAGS = -dynamic
nf_log_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMNL_CFLAGS)
if BUILD_NFCT
nf_log_LDADD += $(LIBNETFILTER_CONNTRACK_LIBS)
@@ -20,5 +18,4 @@ check_PROGRAMS += ulog_test
ulog_test_SOURCES = ulog_test.c
ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la
-ulog_test_LDFLAGS = -dynamic
endif
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [libnetfilter_log PATCH 7/9] build: replace `AM_PROG_LIBTOOL` and `AC_DISABLE_STATIC` with `LT_INIT`
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
` (5 preceding siblings ...)
2021-10-09 11:38 ` [libnetfilter_log PATCH 6/9] build: remove `-dynamic` when linking check progs Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 8/9] build: replace `AC_HELP_STRING` with `AS_HELP_STRING` Jeremy Sowden
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
`AM_PROG_LIBTOOL` is superseded by `LT_INIT`, which also accepts options
to control the defaults for creating shared or static libraries.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1723426aa0c4..1dc9bc7847fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_PROG_CC
AM_PROG_CC_C_O
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
+LT_INIT([disable_static])
AC_PROG_INSTALL
AC_PROG_LN_S
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [libnetfilter_log PATCH 8/9] build: replace `AC_HELP_STRING` with `AS_HELP_STRING`
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
` (6 preceding siblings ...)
2021-10-09 11:38 ` [libnetfilter_log PATCH 7/9] build: replace `AM_PROG_LIBTOOL` and `AC_DISABLE_STATIC` with `LT_INIT` Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-09 11:38 ` [libnetfilter_log PATCH 9/9] Add Emacs artefacts to .gitignore Jeremy Sowden
2021-10-11 23:00 ` [libnetfilter_log PATCH 0/8] Build fixes Pablo Neira Ayuso
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
`AC_HELP_STRING` is obsolete and has been superseded by
`AS_HELP_STRING`.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 1dc9bc7847fa..85e49ede6f2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ case "$host" in
esac
AC_ARG_WITH([ipulog],
- AC_HELP_STRING([--without-ipulog], [don't build libipulog compat library]))
+ AS_HELP_STRING([--without-ipulog], [don't build libipulog compat library]))
AM_CONDITIONAL([BUILD_IPULOG], [test "x$with_ipulog" != xno])
dnl Dependencies
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [libnetfilter_log PATCH 9/9] Add Emacs artefacts to .gitignore
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
` (7 preceding siblings ...)
2021-10-09 11:38 ` [libnetfilter_log PATCH 8/9] build: replace `AC_HELP_STRING` with `AS_HELP_STRING` Jeremy Sowden
@ 2021-10-09 11:38 ` Jeremy Sowden
2021-10-11 23:00 ` [libnetfilter_log PATCH 0/8] Build fixes Pablo Neira Ayuso
9 siblings, 0 replies; 11+ messages in thread
From: Jeremy Sowden @ 2021-10-09 11:38 UTC (permalink / raw)
To: Netfilter Devel
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index 5eaabe38a514..ef6bb0ffdfa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*~
+.\#*
+\#*\#
.deps/
.libs/
Makefile
--
2.33.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [libnetfilter_log PATCH 0/8] Build fixes
2021-10-09 11:38 [libnetfilter_log PATCH 0/8] Build fixes Jeremy Sowden
` (8 preceding siblings ...)
2021-10-09 11:38 ` [libnetfilter_log PATCH 9/9] Add Emacs artefacts to .gitignore Jeremy Sowden
@ 2021-10-11 23:00 ` Pablo Neira Ayuso
9 siblings, 0 replies; 11+ messages in thread
From: Pablo Neira Ayuso @ 2021-10-11 23:00 UTC (permalink / raw)
To: Jeremy Sowden; +Cc: Netfilter Devel
On Sat, Oct 09, 2021 at 12:38:30PM +0100, Jeremy Sowden wrote:
> An assortment of autotools and pkg-config updates.
Series applied, thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread