From e8e12a63f33061186c5e8ddb31a2f62e0b3efd0d Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Fri, 26 Jan 2018 17:05:14 -0500 Subject: [PATCH] Ticket 49552 - Fix build issues on F28 Description: The newer version of gcc on F28 is stricter with linking. Also, unistd.h no longer includes the "unix crypt", so we need to revert to crypt.h https://pagure.io/389-ds-base/issue/49552 Reviewed by: ? --- Makefile.am | 7 ++++--- ldap/servers/plugins/pwdstorage/crypt_pwd.c | 6 ++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0ec12a3c1..34efb0734 100644 --- a/Makefile.am +++ b/Makefile.am @@ -182,7 +182,7 @@ endif #end hpux # If any interfaces have been added since the last public release, then increment age. # If any interfaces have been removed or changed since the last public release, then set age to 0. -SDS_LDFLAGS = $(NSPR_LINK) -version-info 0:0:0 +SDS_LDFLAGS = $(NSPR_LINK) $(NSS_LINK) -lpthread -version-info 0:0:0 NUNCSTANS_LDFLAGS = $(NSPR_LINK) $(EVENT_LINK) -version-info 1:0:1 SLAPD_LDFLAGS = -version-info 1:0:1 @@ -1100,7 +1100,8 @@ libldaputil_la_SOURCES = lib/ldaputil/cert.c \ lib/ldaputil/vtable.c libldaputil_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(DSINTERNAL_CPPFLAGS) -I$(srcdir)/lib/ldaputil - +libldaputil_la_LIBADD = libslapd.la $(NSS_LINK) $(NSPR_LINK) +libldaputil_la_LDFLAGS = $(AM_LDFLAGS) #//////////////////////////////////////////////////////////////// # @@ -2387,7 +2388,7 @@ if HAVE_DOXYGEN doxyfile.stamp: cd $(srcdir); $(DOXYGEN) $(abs_top_builddir)/docs/slapi.doxy - rm $(abs_top_builddir)/man/man3/_* + rm -f $(abs_top_builddir)/man/man3/_* touch doxyfile.stamp # Add the docs to make all. diff --git a/ldap/servers/plugins/pwdstorage/crypt_pwd.c b/ldap/servers/plugins/pwdstorage/crypt_pwd.c index 3bd226581..a72da4755 100644 --- a/ldap/servers/plugins/pwdstorage/crypt_pwd.c +++ b/ldap/servers/plugins/pwdstorage/crypt_pwd.c @@ -24,11 +24,9 @@ #ifndef __USE_XOPEN #define __USE_XOPEN /* linux */ #endif /* __USE_XOPEN */ -#include -#else /* hpux */ -#include -#endif /* hpux */ +#endif +#include #include "pwdstorage.h" static PRLock *cryptlock = NULL; /* Some implementations of crypt are not thread safe. ie. ours & Irix */ -- 2.13.6