Mercurial > dovecot > core-2.2

changeset 21487:8e72ed38d967

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-ssl-iostream: Remove libdovecot_openssl_common.la Using such a library results in the same code being duplicated (in OSX) in both libssl_iostream_openssl.so and libdcrypt_openssl.so. This breaks the idea of openssl_init_refcount, because each one will have their own one. libdcrypt_openssl.so now links to libssl_iostream_openssl.so, which shouldn't really be a problem, because lib-ssl-iostream is part of the core libdovecot.so already. It would have been possible to also install libdovecot_openssl_common.so and link it to both libssl_iostream_openssl.so and libdcrypt_openssl.so, but that seems unnecessarily complicated.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Sun, 05 Feb 2017 20:29:10 +0200
parents c60529d50196
children e97bc5dcf420
files src/lib-dcrypt/Makefile.am src/lib-ssl-iostream/Makefile.am
diffstat 2 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dcrypt/Makefile.am	Sun Feb 05 20:28:04 2017 +0200
+++ b/src/lib-dcrypt/Makefile.am	Sun Feb 05 20:29:10 2017 +0200
@@ -22,9 +22,9 @@
 if BUILD_DCRYPT_OPENSSL
 pkglib_LTLIBRARIES += libdcrypt_openssl.la
 libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c
-libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libdovecot_openssl_common.la
+libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream_openssl.la
 libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
-libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libdovecot_openssl_common.la
+libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libssl_iostream_openssl.la
 libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
 	$(SSL_CFLAGS)
 endif
--- a/src/lib-ssl-iostream/Makefile.am	Sun Feb 05 20:28:04 2017 +0200
+++ b/src/lib-ssl-iostream/Makefile.am	Sun Feb 05 20:29:10 2017 +0200
@@ -10,14 +10,10 @@
 if BUILD_OPENSSL
 module_LTLIBRARIES = libssl_iostream_openssl.la
 
-noinst_LTLIBRARIES += libdovecot_openssl_common.la
-libdovecot_openssl_common_la_LIBADD = $(SSL_LIBS)
-libdovecot_openssl_common_la_SOURCES = \
-	dovecot-openssl-common.c
-
 libssl_iostream_openssl_la_LDFLAGS = -module -avoid-version
-libssl_iostream_openssl_la_LIBADD = libdovecot_openssl_common.la $(SSL_LIBS)
+libssl_iostream_openssl_la_LIBADD = $(SSL_LIBS)
 libssl_iostream_openssl_la_SOURCES = \
+	dovecot-openssl-common.c \
 	iostream-openssl.c \
 	iostream-openssl-common.c \
 	iostream-openssl-context.c \