File sssd-ldflags.diff of Package sssd

Overview Repositories Revisions Requests Users Attributes Meta

File sssd-ldflags.diff of Package sssd (Revision 536081e094c57af4152ba6c84822a5ae)

Currently displaying revision 536081e094c57af4152ba6c84822a5ae , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2012-11-10 01:36:37.022064770 +0100

build: fix link failure because of wrong use of LDFLAGS

ld: src/sss_client/sss_ssh_authorizedkeys-common.o: undefined
	reference to symbol 'pthread_mutexattr_setrobust@@GLIBC_2.12'

For the i'th time,
http://stackoverflow.com/questions/4241683/linker-flags-in-wrong-place

The patch fixes the location of library names, and also adds them
to two program which need them.

---
 Makefile.am |   36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

Index: sssd-1.9.4/Makefile.am
===================================================================
--- sssd-1.9.4.orig/Makefile.am
+++ sssd-1.9.4/Makefile.am
@@ -537,7 +537,8 @@ libipa_hbac_la_SOURCES = \
     src/providers/ipa/hbac_evaluator.c \
     src/util/sss_utf8.c
 libipa_hbac_la_LDFLAGS = \
-    -version-info 0:1:0 \
+    -version-info 0:1:0
+libipa_hbac_la_LIBADD = \
     $(UNICODE_LIBS)
 
 dist_pkgconfig_DATA += src/lib/idmap/sss_idmap.pc
@@ -651,11 +652,11 @@ sssd_be_LDADD = \
     -ldl \
     $(SSSD_LIBS) \
     $(CARES_LIBS) \
+    $(PAM_LIBS) \
     libsss_util.la
 sssd_be_LDFLAGS = \
     -Wl,--version-script,$(srcdir)/src/providers/sssd_be.exports \
-    -export-dynamic \
-    $(PAM_LIBS)
+    -export-dynamic
 
 if BUILD_PYTHON_BINDINGS
 sss_obfuscate_pythondir = $(sbindir)
@@ -771,7 +772,7 @@ sss_sudo_cli_SOURCES = \
     src/sss_client/sudo/sss_sudo_response.c \
     src/sss_client/sudo_testcli/sudo_testcli.c
 sss_sudo_cli_CFLAGS = $(AM_CFLAGS)
-sss_sudo_cli_LDFLAGS = $(CLIENT_LIBS)
+sss_sudo_cli_LDADD = $(CLIENT_LIBS)
 endif
 
 if BUILD_SSH
@@ -781,8 +782,8 @@ sss_ssh_authorizedkeys_SOURCES = \
     src/sss_client/ssh/sss_ssh_authorizedkeys.c
 sss_ssh_authorizedkeys_CFLAGS = $(AM_CFLAGS)
 sss_ssh_authorizedkeys_LDADD = \
+    $(CLIENT_LIBS) \
     libsss_util.la
-sss_ssh_authorizedkeys_LDFLAGS = $(CLIENT_LIBS)
 
 sss_ssh_knownhostsproxy_SOURCES = \
     src/sss_client/common.c \
@@ -790,8 +791,8 @@ sss_ssh_knownhostsproxy_SOURCES = \
     src/sss_client/ssh/sss_ssh_knownhostsproxy.c
 sss_ssh_knownhostsproxy_CFLAGS = $(AM_CFLAGS)
 sss_ssh_knownhostsproxy_LDADD = \
+    $(CLIENT_LIBS) \
     libsss_util.la
-sss_ssh_knownhostsproxy_LDFLAGS = $(CLIENT_LIBS)
 endif
 
 #################
@@ -1149,14 +1150,14 @@ noinst_PROGRAMS += autofs_test_client
 endif
 
 pam_test_client_SOURCES = src/sss_client/pam_test_client.c
-pam_test_client_LDFLAGS = -lpam -lpam_misc
+pam_test_client_LDADD = -lpam -lpam_misc
 
 if BUILD_AUTOFS
 autofs_test_client_SOURCES = src/sss_client/autofs/autofs_test_client.c \
 			     src/sss_client/autofs/sss_autofs.c \
 			     src/sss_client/common.c
 autofs_test_client_CFLAGS = $(AM_CFLAGS)
-autofs_test_client_LDFLAGS = -lpopt $(CLIENT_LIBS)
+autofs_test_client_LDADD = -lpopt $(CLIENT_LIBS)
 endif
 
 ####################
@@ -1178,10 +1179,11 @@ libnss_sss_la_SOURCES = \
     src/sss_client/nss_mc_group.c \
     src/sss_client/nss_mc.h
 libnss_sss_la_LDFLAGS = \
-    $(CLIENT_LIBS) \
     -module \
     -version-info 2:0:0 \
     -Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports
+libnss_sss_la_LIBADD = \
+    $(CLIENT_LIBS)
 
 pamlib_LTLIBRARIES = pam_sss.la
 pam_sss_la_SOURCES = \
@@ -1192,11 +1194,12 @@ pam_sss_la_SOURCES = \
     src/sss_client/sss_pam_macros.h
 
 pam_sss_la_LDFLAGS = \
-    $(CLIENT_LIBS) \
-    -lpam \
     -module \
     -avoid-version \
     -Wl,--version-script,$(srcdir)/src/sss_client/sss_pam.exports
+pam_sss_la_LIBADD = \
+    $(CLIENT_LIBS) \
+    -lpam
 
 if BUILD_SUDO
 
@@ -1207,8 +1210,9 @@ libsss_sudo_la_SOURCES = \
     src/sss_client/sudo/sss_sudo.c \
     src/sss_client/sudo/sss_sudo.h \
     src/sss_client/sudo/sss_sudo_private.h
+libsss_sudo_la_LIBADD = \
+    $(CLIENT_LIBS)
 libsss_sudo_la_LDFLAGS = \
-    $(CLIENT_LIBS) \
     -Wl,--version-script,$(srcdir)/src/sss_client/sss_sudo.exports \
     -module \
     -avoid-version
@@ -1228,10 +1232,11 @@ libsss_autofs_la_SOURCES = \
     src/sss_client/autofs/sss_autofs_private.h
 
 libsss_autofs_la_LDFLAGS = \
-    $(CLIENT_LIBS) \
     -module \
     -avoid-version \
     -Wl,--version-script,$(srcdir)/src/sss_client/autofs/sss_autofs.exports
+libsss_autofs_la_LIBADD = \
+    $(CLIENT_LIBS)
 endif
 
 dist_noinst_DATA += \
@@ -1550,10 +1555,11 @@ sssd_pac_plugin_la_CFLAGS = \
     $(AM_CFLAGS) \
     $(KRB5_CFLAGS)
 sssd_pac_plugin_la_LDFLAGS = \
-    $(CLIENT_LIBS) \
-    -lkrb5 \
     -avoid-version \
     -module
+sssd_pac_plugin_la_LIBADD = \
+    $(CLIENT_LIBS) \
+    -lkrb5
 
 if BUILD_PYTHON_BINDINGS
 pysss_la_SOURCES = \

Places

File sssd-ldflags.diff of Package sssd (Revision 536081e094c57af4152ba6c84822a5ae)

Places