From: Richard Levitte Date: Fri, 15 Oct 2021 10:27:50 +0000 (+0200) Subject: Fix VMS installation - $config{pointer_size} -> $target{pointer_size} X-Git-Tag: openssl-3.2.0-alpha1~3210 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59cf75435d45a678c81df246c1e8283dc60c4c39;p=thirdparty%2Fopenssl.git Fix VMS installation - $config{pointer_size} -> $target{pointer_size} Configurations/descrip.mms.tmpl uses $target{pointer_size}, not $config{pointer_size}, so the same should be used in installation scripts, for consistency. Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/16842) (cherry picked from commit e30545e9bd84e3ace70fb1e1c5ad6d824545fe36) --- diff --git a/VMS/openssl_ivp.com.in b/VMS/openssl_ivp.com.in index d1b1e7adbfb..70fec338b97 100644 --- a/VMS/openssl_ivp.com.in +++ b/VMS/openssl_ivp.com.in @@ -15,7 +15,7 @@ $ OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") - - ".][000000" - "[000000." - "][" - "]A.;" + "." $ $ v := {- sprintf "%02d", split(/\./, $config{version}) -} -$ pz := {- $config{pointer_size} -} +$ pz := {- $target{pointer_size} -} $ $ @'INSTALLTOP_'SYS$STARTUP]openssl_startup'v' $ @'INSTALLTOP_'SYS$STARTUP]openssl_utils'v' diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in index c3b8de8b6d6..42f9ec074d1 100644 --- a/VMS/openssl_shutdown.com.in +++ b/VMS/openssl_shutdown.com.in @@ -27,7 +27,7 @@ $ $ ! Abbrevs $ DEAS := DEASSIGN /NOLOG 'P1' $ sv := {- sprintf "%02d%02d", split m|\.|, $config{shlib_version} -} -$ pz := {- $config{pointer_size} -} +$ pz := {- $target{pointer_size} -} $ $ DEAS OSSL$DATAROOT $ DEAS OSSL$INSTROOT diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index a6624eb6983..e17e923f46c 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -89,7 +89,7 @@ $ ! Abbrevs $ DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1' $ DEF := DEFINE /NOLOG 'P1' $ sv := {- sprintf "%02d%02d", split m|\.|, $config{shlib_version} -} -$ pz := {- $config{pointer_size} -} +$ pz := {- $target{pointer_size} -} $ $ DEFT OSSL$DATAROOT 'OPENSSLDIR_'] $ DEFT OSSL$INSTROOT 'INSTALLTOP_']