krb5 commit: Fix all-liblinks when symlinks are unsupported

Greg Hudson ghudson at mit.edu
Thu Jan 7 01:58:27 EST 2021


https://github.com/krb5/krb5/commit/fe2a9b6254e86a761dd7f79671ee0fc8a754edcd
commit fe2a9b6254e86a761dd7f79671ee0fc8a754edcd
Author: Greg Hudson <ghudson at mit.edu>
Date:   Wed Jan 6 10:44:23 2021 -0500

    Fix all-liblinks when symlinks are unsupported
    
    After building libraries, we make links to a central directory so that
    programs and other libraries can be built against them.  These links
    were changed from symlinks to hard links by commit
    24311fa2b4b95597695560144313debe0211e968, and were reverted to
    symlinks by commit 6e0bfbc787509dbaac4947a76e07a2bd6ba7956d.
    
    As part of the first commit, the links to .so and .so.X were made
    within the central directory instead of directly to the library build
    directory.  However, the dependencies were not updated to ensure that
    the link target is created before the link, so when $(LN_S) is "cp
    -pR" and not "ln -s", the build steps could be executed out of order
    and fail.  This part of the first commit was not reverted in the
    second commit.  Revert it now so that the dependencies match the
    links.
    
    ticket: 8976

 src/config/lib.in |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/config/lib.in b/src/config/lib.in
index 882e602..774e120 100644
--- a/src/config/lib.in
+++ b/src/config/lib.in
@@ -98,12 +98,10 @@ $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT)
 	(cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .)
 $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT): lib$(LIBBASE)$(SHLIBEXT)
 	$(RM) $@
-	(cd $(TOPLIBD) && \
-	 $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) lib$(LIBBASE)$(SHLIBEXT))
+	(cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBEXT) .)
 $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT): lib$(LIBBASE)$(SHLIBSEXT)
 	$(RM) $@
-	(cd $(TOPLIBD) && \
-	 $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) lib$(LIBBASE)$(SHLIBSEXT))
+	(cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBSEXT) .)
 $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT): lib$(LIBBASE)$(SHLIBVEXT)
 	$(RM) $@
 	(cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBVEXT) .)


More information about the cvs-krb5 mailing list