Fix VMS/openssl_{startup,shutddown}.com.in
authorRichard Levitte <levitte@openssl.org>
Mon, 9 May 2016 20:59:02 +0000 (22:59 +0200)
committerRichard Levitte <levitte@openssl.org>
Tue, 10 May 2016 09:28:00 +0000 (11:28 +0200)
They were using the wrong variables.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Configurations/descrip.mms.tmpl
VMS/openssl_shutdown.com.in
VMS/openssl_startup.com.in

index 83ee614..6d08ae8 100644 (file)
@@ -405,7 +405,10 @@ vmsconfig.pm : configdata.pm
         WRITE CONFIG "  OPENSSLDIR => '$(OPENSSLDIR)',"
         WRITE CONFIG "  pointersize => '","{- $target{pointersize} -}","',"
         WRITE CONFIG "  shared_libs => ["
-        {- join("\n        ", map { "WRITE CONFIG \"    '$_'," } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) || "\@ !" -}
+        {- $disabled{shared}
+           ? "\@ !"
+           : join("\n        ", map { "WRITE CONFIG \"    '$_'," } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}})
+        -}
         WRITE CONFIG "  ],"
         WRITE CONFIG ");"
         WRITE CONFIG "our %target = ();"
index 236979e..5385362 100644 (file)
@@ -39,9 +39,7 @@ $     DEAS OSSL$LIB'v'
 $      DEAS OSSL$SHARE'v'
 $      DEAS OSSL$ENGINES'v'
 $      DEAS OSSL$EXE'v'
-$       {- output_off() if $disabled{shared} -}
-$       {- join("\n\$       ", map { "DEAS $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
-$       {- output_on() -}
+$       {- join("\n\$       ", map { my $x = uc $_; "DEAS ${x}'v'" } @{$config{shared_libs}}) -}
 $      IF P2 .NES. "NOALIASES"
 $      THEN
 $          DEAS OSSL$ROOT
@@ -51,9 +49,7 @@ $         DEAS OSSL$SHARE
 $          DEAS OSSL$ENGINES
 $          DEAS OSSL$EXE
 $          DEAS OPENSSL
-$           {- output_off() if $disabled{shared} -}
-$           {- join("\n\$           ", map { "DEAS $_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
-$           {- output_on() -}
+$           {- join("\n\$           ", map { my $x = uc $_; "DEAS ${x}" } @{$config{shared_libs}}) -}
 $      ENDIF
 $
 $      EXIT 'status'
index caad022..e5043b5 100644 (file)
@@ -90,9 +90,7 @@ $     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']
-$       {- output_off() if $disabled{shared} -}
-$       {- join("\n\$       ", map { "DEF  $_'v' OSSL\$SHARE:$_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
-$       {- output_on() -}
+$       {- join("\n\$       ", map { my $x = uc $_; "DEF  ${x}'v' OSSL\$SHARE:${x}" } @{$config{shared_libs}}) -}
 $      IF P2 .NES. "NOALIASES"
 $      THEN
 $          DEF OSSL$INSTROOT   OSSL$INSTROOT'v'
@@ -102,9 +100,7 @@ $       DEF OSSL$SHARE      OSSL$SHARE'v'
 $          DEF OSSL$ENGINES    OSSL$ENGINES'v'
 $          DEF OSSL$EXE        OSSL$EXE'v'
 $          DEF OPENSSL         OSSL$INCLUDE:[OPENSSL]
-$       {- output_off() if $disabled{shared} -}
-$       {- join("\n\$           ", map { "DEF  $_ $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
-$       {- output_on() -}
+$           {- join("\n\$           ", map { my $x = uc $_; "DEF ${x} ${x}'v'" } @{$config{shared_libs}}) -}
 $      ENDIF
 $
 $      DEFT OSSL$DATAROOT      'OPENSSLDIR_'