Commit 7498162d authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent 9481a301

Configurations/descrip.mms.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -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}}; "" -} !

VMS/openssl_startup.com.in

+2 −2
Original line number Diff line number Diff line
@@ -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