#3808 Fix few linking failueres with in 2.0
Merged 5 years ago by fidencio. Opened 5 years ago by lslebodn.
SSSD/ lslebodn/sssd linking_fixes  into  master

file modified
+23 -22
@@ -1105,6 +1105,7 @@ 

      $(TALLOC_LIBS) \

      $(TEVENT_LIBS) \

      $(DBUS_LIBS) \

+     $(UNICODE_LIBS) \

      $(NULL)

  libsss_sbus_la_CFLAGS = \

      $(AM_CFLAGS) \
@@ -1146,6 +1147,7 @@ 

      $(AM_CFLAGS) \

      $(TALLOC_CFLAGS) \

      $(DBUS_CFLAGS) \

+     $(UNICODE_LIBS) \

      $(NULL)

  libsss_sbus_sync_la_LDFLAGS = \

      -avoid-version \
@@ -1209,28 +1211,6 @@ 

      -avoid-version \

      $(NULL)

  

- if BUILD_WITH_LIBSECRET

- pkglib_LTLIBRARIES += libsss_secrets.la

- 

- libsss_secrets_la_SOURCES = \

-     src/util/secrets/secrets.c \

-     src/util/secrets/config.c \

-     $(NULL)

- libsss_secrets_la_CFLAGS = \

-     $(AM_CFLAGS) \

-     $(NULL)

- libsss_secrets_la_LIBADD = \

-     $(TALLOC_LIBS) \

-     $(LDB_LIBS) \

-     libsss_crypt.la \

-     libsss_debug.la \

-     libsss_util.la \

-     $(NULL)

- libsss_secrets_la_LDFLAGS = \

-     -avoid-version \

-     $(NULL)

- endif

- 

  pkglib_LTLIBRARIES += libsss_util.la

  libsss_util_la_SOURCES = \

      src/confdb/confdb.c \
@@ -1314,6 +1294,27 @@ 

  endif

  libsss_util_la_LDFLAGS = -avoid-version

  

+ if BUILD_WITH_LIBSECRET

+ pkglib_LTLIBRARIES += libsss_secrets.la

+ libsss_secrets_la_SOURCES = \

+     src/util/secrets/secrets.c \

+     src/util/secrets/config.c \

+     $(NULL)

+ libsss_secrets_la_CFLAGS = \

+     $(AM_CFLAGS) \

+     $(NULL)

+ libsss_secrets_la_LIBADD = \

+     $(TALLOC_LIBS) \

+     $(LDB_LIBS) \

+     libsss_crypt.la \

+     libsss_debug.la \

+     libsss_util.la \

+     $(NULL)

+ libsss_secrets_la_LDFLAGS = \

+     -avoid-version \

+     $(NULL)

+ endif

+ 

  pkglib_LTLIBRARIES += libsss_semanage.la

  libsss_semanage_la_CFLAGS = \

      $(AM_CFLAGS) \

file modified
+4 -60
@@ -66,67 +66,7 @@ 

      ../../../src/responder/common/cache_req/plugins/cache_req_host_by_name.c \

      $(NULL)

  

- SSSD_SBUS_OBJ = \

-     ../../../src/util/check_and_open.c \

-     ../../../src/util/debug.c \

-     ../../../src/util/sss_ptr_hash.c \

-     ../../../src/util/sss_ptr_list.c \

-     ../../../src/util/sss_utf8.c \

-     ../../../src/util/util.c \

-     ../../../src/util/util_errors.c \

-     ../../../src/util/util_ext.c \

-     ../../../src/util/strtonum.c \

-     ../../../src/sbus/sbus_errors.c \

-     ../../../src/sbus/sbus_opath.c \

-     ../../../src/sbus/connection/sbus_connection.c \

-     ../../../src/sbus/connection/sbus_connection_connect.c \

-     ../../../src/sbus/connection/sbus_dbus.c \

-     ../../../src/sbus/connection/sbus_dispatcher.c \

-     ../../../src/sbus/connection/sbus_reconnect.c \

-     ../../../src/sbus/connection/sbus_send.c \

-     ../../../src/sbus/connection/sbus_watch.c \

-     ../../../src/sbus/interface_dbus/sbus_dbus_arguments.c \

-     ../../../src/sbus/interface_dbus/sbus_dbus_client_async.c \

-     ../../../src/sbus/interface_dbus/sbus_dbus_invokers.c \

-     ../../../src/sbus/interface_dbus/sbus_dbus_keygens.c \

-     ../../../src/sbus/interface_dbus/sbus_dbus_symbols.c \

-     ../../../src/sbus/interface/sbus_interface.c \

-     ../../../src/sbus/interface/sbus_introspection.c \

-     ../../../src/sbus/interface/sbus_iterator_readers.c \

-     ../../../src/sbus/interface/sbus_iterator_writers.c \

-     ../../../src/sbus/interface/sbus_properties.c \

-     ../../../src/sbus/interface/sbus_properties_parser.c \

-     ../../../src/sbus/interface/sbus_std_signals.c \

-     ../../../src/sbus/request/sbus_message.c \

-     ../../../src/sbus/request/sbus_request.c \

-     ../../../src/sbus/request/sbus_request_call.c \

-     ../../../src/sbus/request/sbus_request_hash.c \

-     ../../../src/sbus/request/sbus_request_sender.c \

-     ../../../src/sbus/request/sbus_request_util.c \

-     ../../../src/sbus/router/sbus_router.c \

-     ../../../src/sbus/router/sbus_router_handler.c \

-     ../../../src/sbus/router/sbus_router_hash.c \

-     ../../../src/sbus/server/sbus_server_handler.c \

-     ../../../src/sbus/server/sbus_server_interface.c \

-     ../../../src/sbus/server/sbus_server_match.c \

-     ../../../src/sbus/server/sbus_server.c \

-     $(NULL)

- 

- SSSD_IFACE_OBJ = \

-     ../../../src/sss_iface/sbus_sss_arguments.c \

-     ../../../src/sss_iface/sbus_sss_client_async.c \

-     ../../../src/sss_iface/sbus_sss_invokers.c \

-     ../../../src/sss_iface/sbus_sss_keygens.c \

-     ../../../src/sss_iface/sbus_sss_symbols.c \

-     ../../../src/sss_iface/sss_iface_types.c \

-     ../../../src/sss_iface/sss_iface.c \

-     ../../../src/util/domain_info_utils.c \

-     ../../../src/util/sss_pam_data.c \

-     $(NULL)

- 

  SSSD_RESPONDER_IFACE_OBJ = \

-     $(SSSD_SBUS_OBJ) \

-     $(SSSD_IFACE_OBJ) \

      ../../../src/responder/common/responder_iface.c \

      $(NULL)

  
@@ -244,6 +184,8 @@ 

      $(abs_top_builddir)/libsss_util.la \

      $(abs_top_builddir)/libsss_debug.la \

      $(abs_top_builddir)/libsss_test_common.la \

+     $(abs_top_builddir)/libsss_iface.la \

+     $(abs_top_builddir)/libsss_sbus.la \

      $(NULL)

  

  negcache_tests_SOURCES =\
@@ -262,6 +204,8 @@ 

      $(abs_top_builddir)/libsss_util.la \

      $(abs_top_builddir)/libsss_debug.la \

      $(abs_top_builddir)/libsss_test_common.la \

+     $(abs_top_builddir)/libsss_iface.la \

+     $(abs_top_builddir)/libsss_sbus.la \

      $(NULL)

  

  tests: $(check_PROGRAMS)

@jhrozek, @sbose

I would be really thankful for a review. It will reduce count of patches which I have locally
and it should be useful also for other non-fedora based distros.

rebased onto 7e10566

5 years ago

cc @pbrezina as I will be away until monday

Build, tests and installation pass. Ack.

Commit 53ed60b fixes this pull-request

Pull-Request has been merged by fidencio

5 years ago

Commit 677a933 fixes this pull-request

Pull-Request has been merged by fidencio

5 years ago

Commit 101934f fixes this pull-request

Pull-Request has been merged by fidencio

5 years ago