diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-09 11:06:44 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-10 06:40:47 +0200 |
| commit | 7498162d753fc21aa4a30cb0855479dac0515f5c (patch) | |
| tree | 4920eed315cea52d88b66f367e3533ff4ab8ee6c | |
| parent | VMS: Small cleanups (diff) | |
| download | openssl-7498162d753fc21aa4a30cb0855479dac0515f5c.tar.xz openssl-7498162d753fc21aa4a30cb0855479dac0515f5c.zip | |
VMS: Adjust the engines directory by adding the pointer size to its name
With OpenSSL 1.1 and on, the engines are tightly tied to the shared
library they're to be used with. That makes them depend on the
pointer size as well as the shared library version, and this gets
reflected in the name of the directory they're installed in.
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 6 | ||||
| -rw-r--r-- | VMS/openssl_startup.com.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index b0357f6480..b3cf430860 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -155,7 +155,7 @@ OPENSSLDIR={- catdir($config{openssldir}) || # The same, but for C OPENSSLDIR_C={- $osslprefix -}DATAROOT:[000000] # Where installed engines reside, for C -ENGINESDIR_C={- $osslprefix -}ENGINES{- $sover -}: +ENGINESDIR_C={- $osslprefix -}ENGINES{- $sover.$target{pointer_size} -}: CC= {- $target{cc} -} CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR_C)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR_C)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -} @@ -404,9 +404,9 @@ install_runtime : check_INSTALLTOP install_engines : check_INSTALLTOP @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} ! @ WRITE SYS$OUTPUT "*** Installing engines" - - CREATE/DIR ossl_installroot:[ENGINES{- $sover -}.'arch'] + - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch'] {- join("\n ", - map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover.'arch']" } + map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" } grep(!m|ossltest$|i, @{$unified_info{engines}})) -} @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index c2c36891f4..511c133f01 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -96,7 +96,7 @@ $ DEFT OSSL$INSTROOT 'INSTALLTOP_'] $ DEFT OSSL$INCLUDE 'INSTALLTOP_'INCLUDE.] $ DEF OSSL$LIB OSSL$INSTROOT:[LIB.'arch'] $ DEF OSSL$SHARE OSSL$INSTROOT:[LIB.'arch'] -$ DEF OSSL$ENGINES'sv' OSSL$INSTROOT:[ENGINES'sv'.'arch'] +$ DEF OSSL$ENGINES'sv''pz' OSSL$INSTROOT:[ENGINES'sv''pz'.'arch'] $ DEF OSSL$EXE OSSL$INSTROOT:[EXE.'arch'],- OSSL$INSTROOT:[EXE] $ DEF OSSL$LIBCRYPTO'pz' OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB @@ -107,7 +107,7 @@ $ DEF OPENSSL OSSL$INCLUDE:[OPENSSL] $ $ IF P2 .NES. "NOALIASES" $ THEN -$ DEF OSSL$ENGINES OSSL$ENGINES'sv' +$ DEF OSSL$ENGINES'pz' OSSL$ENGINES'sv''pz' $ DEF OSSL$LIBCRYPTO_SHR'pz' OSSL$LIBCRYPTO'sv'_SHR'pz' $ DEF OSSL$LIBSSL_SHR'pz' OSSL$LIBSSL'sv'_SHR'pz' $ ENDIF |