From: Peter van Dijk Date: Tue, 17 Sep 2024 10:38:26 +0000 (+0200) Subject: auth: don't build .so for non-dyn modules X-Git-Tag: rec-5.2.0-beta1~8^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=201e0365605d687de9c7f814f60ee2ea3aaa6644;p=thirdparty%2Fpdns.git auth: don't build .so for non-dyn modules fixes #14027 --- diff --git a/configure.ac b/configure.ac index 011b5a7ec6..6cd518a10f 100644 --- a/configure.ac +++ b/configure.ac @@ -341,6 +341,19 @@ AS_IF([test "x$PACKAGEVERSION" != "x"], export moduledirs moduleobjects modulelibs +AM_CONDITIONAL([BINDBACKEND_DYNMODULE], [echo $dynmodules | grep -w bind]) +AM_CONDITIONAL([GEOIPBACKEND_DYNMODULE], [echo $dynmodules | grep -w geoip]) +AM_CONDITIONAL([GMYSQLBACKEND_DYNMODULE], [echo $dynmodules | grep -w gmysql]) +AM_CONDITIONAL([GODBCBACKEND_DYNMODULE], [echo $dynmodules | grep -w godbc]) +AM_CONDITIONAL([GPGSQLBACKEND_DYNMODULE], [echo $dynmodules | grep -w gpgsql]) +AM_CONDITIONAL([GSQLITE3BACKEND_DYNMODULE], [echo $dynmodules | grep -w gsqlite3]) +AM_CONDITIONAL([LDAPBACKEND_DYNMODULE], [echo $dynmodules | grep -w ldap]) +AM_CONDITIONAL([LMDBBACKEND_DYNMODULE], [echo $dynmodules | grep -w lmdb]) +AM_CONDITIONAL([LUA2BACKEND_DYNMODULE], [echo $dynmodules | grep -w lua2]) +AM_CONDITIONAL([PIPEBACKEND_DYNMODULE], [echo $dynmodules | grep -w pipe]) +AM_CONDITIONAL([REMOTEBACKEND_DYNMODULE], [echo $dynmodules | grep -w remote]) +AM_CONDITIONAL([TINYDNSBACKEND_DYNMODULE], [echo $dynmodules | grep -w tinydns]) + AC_CONFIG_FILES([ Makefile modules/Makefile diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am index 7906e2078c..a41769b0bd 100644 --- a/modules/bindbackend/Makefile.am +++ b/modules/bindbackend/Makefile.am @@ -18,4 +18,8 @@ libbindbackend_la_SOURCES = \ bindbackend2.cc bindbackend2.hh \ binddnssec.cc +if BINDBACKEND_DYNMODULE libbindbackend_la_LDFLAGS = -module -avoid-version +else +libbindbackend_la_LDFLAGS = -static -avoid-version +endif diff --git a/modules/geoipbackend/Makefile.am b/modules/geoipbackend/Makefile.am index f7ea40739f..0c32f2922a 100644 --- a/modules/geoipbackend/Makefile.am +++ b/modules/geoipbackend/Makefile.am @@ -10,5 +10,9 @@ libgeoipbackend_la_SOURCES = \ geoipinterface-mmdb.cc \ geoipinterface.cc geoipinterface.hh +if GEOIPBACKEND_DYNMODULE libgeoipbackend_la_LDFLAGS = -module -avoid-version +else +libgeoipbackend_la_LDFLAGS = -static -avoid-version +endif libgeoipbackend_la_LIBADD = $(YAML_LIBS) $(GEOIP_LIBS) $(MMDB_LIBS) $(CXXFS_LIBS) diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am index 2fbbc5c4c8..431160f6f4 100644 --- a/modules/gmysqlbackend/Makefile.am +++ b/modules/gmysqlbackend/Makefile.am @@ -20,5 +20,9 @@ libgmysqlbackend_la_SOURCES = \ gmysqlbackend.cc gmysqlbackend.hh \ smysql.cc smysql.hh +if GMYSQLBACKEND_DYNMODULE libgmysqlbackend_la_LDFLAGS = -module -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS) +else +libgmysqlbackend_la_LDFLAGS = -static -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS) +endif libgmysqlbackend_la_LIBADD = $(MYSQL_LIBS) diff --git a/modules/godbcbackend/Makefile.am b/modules/godbcbackend/Makefile.am index 3941d4e197..ed4f765e50 100644 --- a/modules/godbcbackend/Makefile.am +++ b/modules/godbcbackend/Makefile.am @@ -15,5 +15,9 @@ libgodbcbackend_la_SOURCES = \ godbcbackend.cc godbcbackend.hh \ sodbc.cc sodbc.hh +if GODBCBACKEND_DYNMODULE libgodbcbackend_la_LDFLAGS = -module -avoid-version +else +libgodbcbackend_la_LDFLAGS = -static -avoid-version +endif libgodbcbackend_la_LIBADD = $(UNIXODBC_LIBS) diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am index b9663a530a..0d190862fb 100644 --- a/modules/gpgsqlbackend/Makefile.am +++ b/modules/gpgsqlbackend/Makefile.am @@ -19,5 +19,9 @@ libgpgsqlbackend_la_SOURCES = \ gpgsqlbackend.cc gpgsqlbackend.hh \ spgsql.cc spgsql.hh +if GPGSQLBACKEND_DYNMODULE libgpgsqlbackend_la_LDFLAGS = -module -avoid-version +else +libgpgsqlbackend_la_LDFLAGS = -static -avoid-version +endif libgpgsqlbackend_la_LIBADD = $(PGSQL_LIBS) diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am index 4f2b46c58a..8f3a1dfffa 100644 --- a/modules/gsqlite3backend/Makefile.am +++ b/modules/gsqlite3backend/Makefile.am @@ -18,4 +18,8 @@ dist_doc_DATA = \ libgsqlite3backend_la_SOURCES = gsqlite3backend.cc gsqlite3backend.hh +if GSQLITE3BACKEND_DYNMODULE libgsqlite3backend_la_LDFLAGS = -module -avoid-version +else +libgsqlite3backend_la_LDFLAGS = -static -avoid-version +endif diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am index ae2fb7a6b6..685b05743c 100644 --- a/modules/ldapbackend/Makefile.am +++ b/modules/ldapbackend/Makefile.am @@ -22,5 +22,9 @@ libldapbackend_la_SOURCES = \ primary.cc \ utils.hh +if LDAPBACKEND_DYNMODULE libldapbackend_la_LDFLAGS = -module -avoid-version +else +libldapbackend_la_LDFLAGS = -static -avoid-version +endif libldapbackend_la_LIBADD = $(LDAP_LIBS) $(KRB5_LIBS) diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am index d097aee8df..0211a80650 100644 --- a/modules/lmdbbackend/Makefile.am +++ b/modules/lmdbbackend/Makefile.am @@ -8,5 +8,9 @@ liblmdbbackend_la_SOURCES = \ ../../ext/lmdb-safe/lmdb-safe.hh ../../ext/lmdb-safe/lmdb-safe.cc \ ../../ext/lmdb-safe/lmdb-typed.hh ../../ext/lmdb-safe/lmdb-typed.cc \ lmdbbackend.cc lmdbbackend.hh +if LMDBBACKEND_DYNMODULE liblmdbbackend_la_LDFLAGS = -module -avoid-version $(BOOST_SERIALIZATION_LDFLAGS) +else +liblmdbbackend_la_LDFLAGS = -static -avoid-version $(BOOST_SERIALIZATION_LDFLAGS) +endif liblmdbbackend_la_LIBADD = $(LMDB_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SYSTEMD_LIBS) diff --git a/modules/lua2backend/Makefile.am b/modules/lua2backend/Makefile.am index 0a0d6c7b8f..22cdcb0593 100644 --- a/modules/lua2backend/Makefile.am +++ b/modules/lua2backend/Makefile.am @@ -10,5 +10,9 @@ liblua2backend_la_SOURCES = \ lua2api2.hh lua2api2.cc \ lua2backend.cc lua2backend.hh +if LUA2BACKEND_DYNMODULE liblua2backend_la_LDFLAGS = -module -avoid-version +else +liblua2backend_la_LDFLAGS = -static -avoid-version +endif liblua2backend_la_LIBADD = $(LUA_LIBS) diff --git a/modules/pipebackend/Makefile.am b/modules/pipebackend/Makefile.am index 8dbf30dbb8..3b25f497a7 100644 --- a/modules/pipebackend/Makefile.am +++ b/modules/pipebackend/Makefile.am @@ -11,5 +11,9 @@ libpipebackend_la_SOURCES = \ coprocess.cc coprocess.hh \ pipebackend.cc pipebackend.hh +if PIPEBACKEND_DYNMODULE libpipebackend_la_LDFLAGS = -module -avoid-version +else +libpipebackend_la_LDFLAGS = -static -avoid-version +endif diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am index db6a4a4ac4..a342a87cf6 100644 --- a/modules/remotebackend/Makefile.am +++ b/modules/remotebackend/Makefile.am @@ -53,7 +53,11 @@ libremotebackend_la_SOURCES = \ unixconnector.cc \ zmqconnector.cc +if REMOTEBACKEND_DYNMODULE libremotebackend_la_LDFLAGS = -module -avoid-version +else +libremotebackend_la_LDFLAGS = -static -avoid-version +endif libremotebackend_la_LIBADD = $(YAHTTP_LIBS) $(JSON11_LIBS) diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am index 013c4d942b..7b9dbfc30d 100644 --- a/modules/tinydnsbackend/Makefile.am +++ b/modules/tinydnsbackend/Makefile.am @@ -8,5 +8,9 @@ libtinydnsbackend_la_SOURCES = \ ../../pdns/cdb.cc ../../pdns/cdb.hh \ tinydnsbackend.cc tinydnsbackend.hh +if TINYDNSBACKEND_DYNMODULE libtinydnsbackend_la_LDFLAGS = -module -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS) +else +libtinydnsbackend_la_LDFLAGS = -static -avoid-version $(LIBCRYPTO_LDFLAGS) $(LIBSSL_LDFLAGS) +endif libtinydnsbackend_la_LIBADD = $(CDB_LIBS)