From fd3522c37b6cb67d335a0fbc68346bfdc617aed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 9 May 2023 13:38:37 +0200 Subject: [PATCH] Add Userspace-RCU to global CFLAGS and LIBS The Userspace-RCU headers are now needed for more parts of the libisc and libdns, thus we need to add it globally to prevent compilation failures on systems with non-standard Userspace-RCU installation path. --- configure.ac | 3 +++ lib/dns/Makefile.am | 2 -- lib/isc/Makefile.am | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 46dcc2a441..11a7b68a3f 100644 --- a/configure.ac +++ b/configure.ac @@ -244,6 +244,9 @@ AC_DEFINE_UNQUOTED([RCU_FLAVOR], ["$RCU_FLAVOR"], [Chosen Userspace-RCU flavor]) PKG_CHECK_VERSION([RCU_VERSION], [$RCU_FLAVOR]) AC_DEFINE_UNQUOTED([RCU_VERSION], ["$RCU_VERSION"], [Compile-time Userspace-RCU version]) +CFLAGS="$CFLAGS $LIBURCU_CFLAGS" +LIBS="$LIBS $LIBURCU_LIBS" + # Fuzzing is not included in pairwise testing as fuzzing tools are # not present in the relevant Docker image. # diff --git a/lib/dns/Makefile.am b/lib/dns/Makefile.am index a70d7e7381..1db6d6585a 100644 --- a/lib/dns/Makefile.am +++ b/lib/dns/Makefile.am @@ -263,7 +263,6 @@ libdns_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(LIBDNS_CFLAGS) \ $(LIBISC_CFLAGS) \ - $(LIBURCU_CFLAGS) \ $(LIBUV_CFLAGS) \ $(OPENSSL_CFLAGS) @@ -273,7 +272,6 @@ libdns_la_LDFLAGS = \ libdns_la_LIBADD = \ $(LIBISC_LIBS) \ - $(LIBURCU_LIBS) \ $(LIBUV_LIBS) \ $(OPENSSL_LIBS) diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am index df23562ac4..7d74517464 100644 --- a/lib/isc/Makefile.am +++ b/lib/isc/Makefile.am @@ -212,7 +212,6 @@ endif USE_ISC_RWLOCK libisc_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(LIBISC_CFLAGS) \ - $(LIBURCU_CFLAGS) \ $(LIBUV_CFLAGS) \ $(OPENSSL_CFLAGS) \ $(ZLIB_CFLAGS) @@ -222,7 +221,6 @@ libisc_la_LDFLAGS = \ -release "$(PACKAGE_VERSION)" libisc_la_LIBADD = \ - $(LIBURCU_LIBS) \ $(LIBUV_LIBS) \ $(OPENSSL_LIBS) \ $(ZLIB_LIBS)