[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  2b9608b049eb33269f9b900e9e5f1c37fc1a1563 (commit)
      from  180df315c789be1138ce2643583362f4b37c8809 (commit)


- Log -----------------------------------------------------------------
commit 2b9608b049eb33269f9b900e9e5f1c37fc1a1563
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 22 14:26:40 2016 +0100

    Fix incorrect SO name on GNU platforms
    
    An error was introduced with the setting of SHLIB in DO_GNU_SO.
    A common DO_GNU_SO_COMMON that both DO_GNU_SO and DO_GNU_SO_NOCALC use
    makes things clearer.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.shared | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.shared b/Makefile.shared
index 7a89019..743b646 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -162,13 +162,13 @@ LINK_SO_SHLIB_UNPACKED=	\
 
 DETECT_GNU_LD=($(CC) -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
 
-DO_GNU_SO_NOCALC=\
-	SHLIB=$(LIBNAME).so; \
+DO_GNU_SO_COMMON=\
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-DO_GNU_SO=$(CALC_VERSIONS); $(DO_GNU_SO_NOCALC); SHLIB=lib$$SHLIB
+DO_GNU_SO_NOCALC=SHLIB=$(LIBNAME).so; $(DO_GNU_SO_COMMON)
+DO_GNU_SO=SHLIB=lib$$SHLIB; $(CALC_VERSIONS); $(DO_GNU_SO_COMMON)
 DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-rpath,$(LIBRPATH)"
 
 #This is rather special.  It's a special target with which one can link