[SSSD] [PATCH] BUILD: Do not build libsss_ad_common.la as standard library
Lukas Slebodnik
lslebodn at redhat.com
Wed Sep 23 04:42:36 UTC 2015
ehlo,
libsss_ad_common.la was a dynamic library and was linked just with unit tests.
It was a workaroud because module libsss_ad.so cannot be linked with tests
without portability issues. But it was addted to pkglib_LTLIBRARIES
and therefore it was installed with other libraries.
This patch changed it and libsss_ad_test.la (old name libsss_ad_common.la)
will be compiled only for unit tests (check_LTLIBRARIES) and will not
be installed with command "make install".
LS
-------------- next part --------------
>From b22b436eeea6ec7a7f909a06927b141b12c88734 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Tue, 22 Sep 2015 13:57:13 +0200
Subject: [PATCH 1/3] BUILD: Do not build libsss_ad_common.la as library
libsss_ad_common.la was a dynamic library and was linked just with unit tests.
It was a workaroud because module libsss_ad.so cannot be linked with tests
without portability issues. But it was addted to pkglib_LTLIBRARIES
and therefore it was installed with other libraries.
This patch changed it and libsss_ad_test.la (old name libsss_ad_common.la)
will be compiled only for unit tests (check_LTLIBRARIES) and will not
be installed with command "make install".
---
Makefile.am | 33 +++++++++++++++------------------
contrib/sssd.spec.in | 1 -
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c8d8bf2e0ecffb2b7260fa859abe8a7490a7e225..a0b0df7421626094e696a6a72191ad58c05b447b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1421,6 +1421,10 @@ check_LTLIBRARIES += \
libsss_nss_idmap_tests.la \
$(NULL)
+if BUILD_SAMBA
+check_LTLIBRARIES += libsss_ad_tests.la
+endif
+
libdlopen_test_providers_la_SOURCES = \
$(sssd_be_SOURCES)
libdlopen_test_providers_la_CFLAGS = \
@@ -1449,6 +1453,14 @@ libsss_nss_idmap_tests_la_LDFLAGS = \
dist_noinst_DATA += src/sss_client/idmap/sss_nss_idmap.unit_tests
+libsss_ad_tests_la_SOURCES = $(libsss_ad_la_SOURCES)
+libsss_ad_tests_la_CFLAGS = $(libsss_ad_la_CFLAGS)
+libsss_ad_tests_la_LIBADD = $(libsss_ad_la_LIBADD)
+libsss_ad_tests_la_LDFLAGS = \
+ -shared \
+ -rpath $(abs_top_builddir) \
+ $(NULL)
+
dlopen_tests_SOURCES = \
src/tests/dlopen-tests.c
dlopen_tests_CFLAGS = \
@@ -2169,7 +2181,7 @@ ad_access_filter_tests_LDADD = \
$(TEVENT_LIBS) \
$(SSSD_INTERNAL_LTLIBS) \
libsss_ldap_common.la \
- libsss_ad_common.la \
+ libsss_ad_tests.la \
libsss_test_common.la \
libdlopen_test_providers.la \
$(NULL)
@@ -2188,7 +2200,7 @@ ad_gpo_tests_LDADD = \
libsss_ldap_common.la \
libsss_idmap.la \
libsss_krb5_common.la \
- libsss_ad_common.la \
+ libsss_ad_tests.la \
libsss_test_common.la \
libdlopen_test_providers.la \
$(NULL)
@@ -2540,7 +2552,7 @@ test_ipa_subdom_server_LDADD = \
$(KRB5_LIBS) \
$(SSSD_INTERNAL_LTLIBS) \
libsss_ldap_common.la \
- libsss_ad_common.la \
+ libsss_ad_tests.la \
libsss_test_common.la \
libdlopen_test_providers.la \
$(NULL)
@@ -2839,21 +2851,6 @@ libsss_ldap_common_la_SOURCES += \
src/providers/ldap/sdap_async_autofs.c
endif
-if BUILD_SAMBA
-pkglib_LTLIBRARIES += libsss_ad_common.la
-endif
-libsss_ad_common_la_SOURCES = \
- $(libsss_ad_la_SOURCES)
-libsss_ad_common_la_LDFLAGS = \
- -avoid-version
-libsss_ad_common_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(NDR_NBT_CFLAGS) \
- $(SMBCLIENT_CFLAGS)
-libsss_ad_common_la_LIBADD = \
- $(NDR_NBT_LIBS) \
- $(SMBCLIENT_LIBS)
-
libsss_krb5_common_la_SOURCES = \
src/providers/krb5/krb5_utils.c \
src/providers/krb5/krb5_delayed_online_authentication.c \
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 5ca26495bf5cd21da0f652d8f5ff78aa3b0c9067..63c107c1ea1eb30ffed4dc7bbecd137548dc470a 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -777,7 +777,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/%{name}/libsss_ad.so
-%{_libdir}/%{name}/libsss_ad_common.so
%{_libexecdir}/%{servicename}/gpo_child
%{_mandir}/man5/sssd-ad.5*
--
2.5.0
-------------- next part --------------
>From 3a6bc07caaa75e0388b2a44ca09a6c3ac16157cd Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Mon, 21 Sep 2015 21:32:42 +0200
Subject: [PATCH 2/3] BUILD: Remove unused variable SSSD_UTIL_OBJ
It was removed as part of commit
fe2091327ff44f80d6681c261494e4432404e9ba
---
Makefile.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a0b0df7421626094e696a6a72191ad58c05b447b..fbdcdd536fb9b2cacde1ce96c7b5ef10c5badc7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1158,7 +1158,6 @@ sssd_pac_SOURCES = \
src/responder/pac/pacsrv.c \
src/responder/pac/pacsrv_cmd.c \
src/responder/pac/pacsrv_utils.c \
- $(SSSD_UTIL_OBJ) \
$(SSSD_RESPONDER_OBJ)
sssd_pac_CFLAGS = \
$(AM_CFLAGS) \
@@ -1184,7 +1183,6 @@ sssd_ifp_SOURCES = \
src/responder/ifp/ifp_users.c \
src/responder/ifp/ifp_groups.c \
src/responder/ifp/ifp_cache.c \
- $(SSSD_UTIL_OBJ) \
$(SSSD_RESPONDER_OBJ)
sssd_ifp_CFLAGS = \
$(AM_CFLAGS)
--
2.5.0
More information about the sssd-devel
mailing list