[packages/libargon2] make symlink patch install re-entrant

glen glen at pld-linux.org
Wed Aug 23 08:29:08 CEST 2017


commit d05440e1d261f019d360fb54f0bbcd3afb8d8686
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Aug 23 09:26:24 2017 +0300

    make symlink patch install re-entrant
    
    also fixes .so being installed as file, not symlink

 makefile.patch | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/makefile.patch b/makefile.patch
index 5a80304..cd5e772 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -24,18 +24,14 @@
  	SRC += src/opt.c
  endif
  
-@@ -87,8 +87,10 @@
+@@ -87,5 +87,6 @@
  endif
  
  LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
 +LIB_SH_VERSION := $(LIB_SH).0
  LIB_ST := lib$(LIB_NAME).a
  LIBRARIES = $(LIB_SH) $(LIB_ST)
-+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
- HEADERS = include/argon2.h
- 
- INSTALL = install
-@@ -105,7 +107,7 @@
+@@ -105,7 +106,7 @@
  
  .PHONY: clean dist format $(GENKAT) all install
  
@@ -44,15 +40,10 @@
  libs: $(LIBRARIES)
  
  $(RUN):	        $(SRC) $(SRC_RUN)
-@@ -154,8 +156,10 @@
- 
- install: $(RUN) libs
-+	mv $(LIB_SH) $(LIB_SH_VERSION)
-+	ln -sf $(LIB_SH_VERSION) $(LIB_SH)
- 	$(INSTALL) -d $(INST_INCLUDE)
- 	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
- 	$(INSTALL) -d $(INST_LIBRARY)
--	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+	$(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
+@@ -160,2 +161,6 @@
  	$(INSTALL) -d $(INST_BINARY)
  	$(INSTALL) $(RUN) $(INST_BINARY)
++	# rename library to match SONAME
++	mv $(INST_LIBRARY)/$(LIB_SH) $(INST_LIBRARY)/$(LIB_SH_VERSION)
++	# keep symlink for development
++	ln -sf $(LIB_SH_VERSION) $(INST_LIBRARY)/$(LIB_SH)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libargon2.git/commitdiff/d05440e1d261f019d360fb54f0bbcd3afb8d8686



More information about the pld-cvs-commit mailing list