[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f46661de7806b5bae507d17185bda2bafd6c20d8 (commit)
      from  ebca7961a6bc2652ecb3cf6dda3f43943e2965d3 (commit)


- Log -----------------------------------------------------------------
commit f46661de7806b5bae507d17185bda2bafd6c20d8
Author: Richard Levitte <levi...@openssl.org>
Date:   Fri Oct 28 23:35:37 2016 +0200

    HPUX: Add the forgotten $(DSTDIR) when linking DSOs
    
    Reviewed-by: Andy Polyakov <ap...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1802)

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

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

diff --git a/Makefile.shared b/Makefile.shared
index e82ed1d..098e1ec 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -497,8 +497,8 @@ link_dso.hpux:
        expr $(PLATFORM) : 'hpux64' > /dev/null && 
ALLSYMSFLAGS='-Wl,+forceload'; \
        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) 
-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:";
 \
        fi; \
-       rm -f $$SHLIB$$SHLIB_SUFFIX || :; \
-       $(LINK_SO_DSO) && chmod a=rx $$SHLIB$$SHLIB_SUFFIX
+       rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SUFFIX || :; \
+       $(LINK_SO_DSO) && chmod a=rx $(DSTDIR)/$$SHLIB$$SHLIB_SUFFIX
 link_shlib.hpux:
        @if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
        $(CALC_VERSIONS); \
@@ -510,8 +510,8 @@ link_shlib.hpux:
        expr $(PLATFORM) : 'hpux64' > /dev/null && 
ALLSYMSFLAGS='-Wl,+forceload'; \
        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) 
-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:";
 \
        fi; \
-       rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
-       $(LINK_SO_SHLIB) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
+       rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
+       $(LINK_SO_SHLIB) && chmod a=rx 
$(DSTDIR)/$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_app.hpux:
        @if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \
        LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,+s,+cdp,../:,+cdp,./:"; \
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits