>From 22659495827d2e5f3ea06ef25c2ff27dc5c3d4ab Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 2 Oct 2015 09:33:28 +0200 Subject: [PATCH 1/3] BUILD: Link just libsss_crypto with crypto libraries It should prevent such failures as in commit 73ec8fdfddb2d4bf99977f758eec80e1b1ee8542 BUILD: Link test_data_provider_be with -ldl --- Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index ce3166716eab20c7b98005faf938f32458dbd673..6ed3de0c2aca12f156a1b8341f10827f722f5a06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -488,7 +488,6 @@ SSSD_LIBS = \ $(INI_CONFIG_LIBS) \ $(COLLECTION_LIBS) \ $(DHASH_LIBS) \ - $(SSS_CRYPT_LIBS) \ $(OPENLDAP_LIBS) \ $(TDB_LIBS) @@ -719,6 +718,11 @@ libsss_child_la_LDFLAGS = -avoid-version pkglib_LTLIBRARIES += libsss_crypt.la +# NOTE: +# Please try to avoid using SSS_CRYPT_{CFLAGS,LIBS} directly for compiling and +# linking programs or libraries. This is purpose of wrapper library +# libsss_crypt.so to hide internals. SSS_CRYPT_{CFLAGS,LIBS} might be used +# in unit tests if you directly uses functions from underlining crypto libraries if HAVE_NSS SSS_CRYPT_SOURCES = src/util/crypto/nss/nss_base64.c \ src/util/crypto/nss/nss_hmac_sha1.c \ @@ -2244,7 +2248,6 @@ sdap_tests_SOURCES = \ $(NULL) sdap_tests_CFLAGS = \ $(AM_CFLAGS) \ - $(SSS_CRYPT_CFLAGS) \ $(NULL) sdap_tests_LDFLAGS = \ -Wl,-wrap,ldap_set_option \ @@ -2261,7 +2264,6 @@ sdap_tests_LDADD = \ $(LDB_LIBS) \ $(POPT_LIBS) \ $(SSSD_INTERNAL_LTLIBS) \ - $(SSS_CRYPT_LIBS) \ $(OPENLDAP_LIBS) \ libsss_test_common.la \ $(NULL) -- 2.5.0