diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-02 08:35:12 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-02 15:49:45 +0200 |
| commit | 8842005e75c2f42ed594a3b44189e0e5ac29be18 (patch) | |
| tree | 8d6ef334550ff3c870a3e1e789a563f70859c0df /VMS | |
| parent | 34d5490a1dc0d3c27743879f303102528e567f82 (diff) | |
| download | openssl-new-8842005e75c2f42ed594a3b44189e0e5ac29be18.tar.gz | |
Have the VMS shared library file names contain the shared version
Also, have the static library file names contain the pointer size when
applicable.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'VMS')
| -rw-r--r-- | VMS/openssl_shutdown.com.in | 10 | ||||
| -rw-r--r-- | VMS/openssl_startup.com.in | 36 |
2 files changed, 29 insertions, 17 deletions
diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in index 73ef3808d4..01971f3667 100644 --- a/VMS/openssl_shutdown.com.in +++ b/VMS/openssl_shutdown.com.in @@ -36,7 +36,10 @@ $ DEAS OSSL$LIB'v' $ DEAS OSSL$SHARE'v' $ DEAS OSSL$ENGINES'v' $ DEAS OSSL$EXE'v' -$ {- join("\n\$ ", map { my $x = uc $_; "DEAS ${x}'v'" } @{$config{shared_libs}}) -} +$ DEAS OSSL$LIBCRYPTO'pz''v' +$ DEAS OSSL$LIBSSL'pz''v' +$ DEAS OSSL$LIBCRYPTO'sv'_SHR'pz' +$ DEAS OSSL$LIBSSL'sv'_SHR'pz' $ IF P2 .NES. "NOALIASES" $ THEN $ DEAS OSSL$ROOT @@ -46,7 +49,10 @@ $ DEAS OSSL$SHARE $ DEAS OSSL$ENGINES $ DEAS OSSL$EXE $ DEAS OPENSSL -$ {- join("\n\$ ", map { my $x = uc $_; "DEAS ${x}" } @{$config{shared_libs}}) -} +$ DEAS OSSL$LIBCRYPTO'pz' +$ DEAS OSSL$LIBSSL'pz' +$ DEAS OSSL$LIBCRYPTO_SHR'pz' +$ DEAS OSSL$LIBSSL_SHR'pz' $ ENDIF $ $ EXIT 'status' diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index f9350b00df..c22dbfc9c9 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -84,23 +84,29 @@ $ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -} $ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -} $ pz := {- $config{pointer_size} -} $ -$ DEFT OSSL$INSTROOT'v' 'INSTALLTOP_' -$ DEFT OSSL$INCLUDE'v' OSSL$INSTROOT:[INCLUDE.] -$ DEF OSSL$LIB'v' OSSL$INSTROOT:[LIB.'arch'] -$ DEF OSSL$SHARE'v' OSSL$INSTROOT:[LIB.'arch'] -$ DEF OSSL$ENGINES'v' OSSL$INSTROOT:[ENGINES.'arch'] -$ DEF OSSL$EXE'v' OSSL$INSTROOT:[EXE.'arch'] -$ {- join("\n\$ ", map { my $x = uc $_; "DEF ${x}'v' OSSL\$SHARE:${x}" } @{$config{shared_libs}}) -} +$ DEFT OSSL$INSTROOT'v' 'INSTALLTOP_' +$ DEFT OSSL$INCLUDE'v' OSSL$INSTROOT'v':[INCLUDE.] +$ DEF OSSL$LIB'v' OSSL$INSTROOT'v':[LIB.'arch'] +$ DEF OSSL$SHARE'v' OSSL$INSTROOT'v':[LIB.'arch'] +$ DEF OSSL$ENGINES'v' OSSL$INSTROOT'v':[ENGINES.'arch'] +$ DEF OSSL$EXE'v' OSSL$INSTROOT'v':[EXE.'arch'] +$ DEF OSSL$LIBCRYPTO'pz''v' OSSL$LIB'v':OSSL$LIBCRYPTO'pz'.OLB +$ DEF OSSL$LIBSSL'pz''v' OSSL$LIB'v':OSSL$LIBSSL'pz'.OLB +$ DEF OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE'v':OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE +$ DEF OSSL$LIBSSL'sv'_SHR'pz' OSSL$SHARE'v':OSSL$LIBSSL'sv'_SHR'pz'.EXE $ IF P2 .NES. "NOALIASES" $ THEN -$ DEF OSSL$INSTROOT OSSL$INSTROOT'v' -$ DEF OSSL$INCLUDE OSSL$INCLUDE'v' -$ DEF OSSL$LIB OSSL$LIB'v' -$ DEF OSSL$SHARE OSSL$SHARE'v' -$ DEF OSSL$ENGINES OSSL$ENGINES'v' -$ DEF OSSL$EXE OSSL$EXE'v' -$ DEF OPENSSL OSSL$INCLUDE:[OPENSSL] -$ {- join("\n\$ ", map { my $x = uc $_; "DEF ${x} ${x}'v'" } @{$config{shared_libs}}) -} +$ DEF OSSL$INSTROOT OSSL$INSTROOT'v' +$ DEF OSSL$INCLUDE OSSL$INCLUDE'v' +$ DEF OSSL$LIB OSSL$LIB'v' +$ DEF OSSL$SHARE OSSL$SHARE'v' +$ DEF OSSL$ENGINES OSSL$ENGINES'v' +$ DEF OSSL$EXE OSSL$EXE'v' +$ DEF OSSL$LIBCRYPTO'pz' OSSL$LIBCRYPTO'pz''v' +$ DEF OSSL$LIBSSL'pz' OSSL$LIBSSL'pz''v' +$ DEF OSSL$LIBCRYPTO_SHR'pz' OSSL$LIBCRYPTO'sv'_SHR'pz' +$ DEF OSSL$LIBSSL_SHR'pz' OSSL$LIBSSL'sv'_SHR'pz' +$ DEF OPENSSL OSSL$INCLUDE:[OPENSSL] $ ENDIF $ $ DEFT OSSL$DATAROOT 'OPENSSLDIR_' |