diff options
| author | Richard Levitte <levitte@openssl.org> | 2023-04-14 08:42:08 +0200 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-04-21 17:05:43 +0100 |
| commit | 58440f74e1bfc9e2eb7720fb635ec9b433c0aa8d (patch) | |
| tree | dce3fa024df67be9d1499a3bd7ca6b8f71052345 | |
| parent | 8daa2616bbe6f7994e0cdd796d3280118c51d8d8 (diff) | |
Have Windows and VMS build files use shlib_variant
This is an omission, it should have been in place a long time ago.
Fixes #20732
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20734)
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 10 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index e1aecfafbc..1685941e8a 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -13,6 +13,8 @@ our $sover_dirname = sprintf "%02d%02d", split(/\./, $config{shlib_version_number}); our $osslver = sprintf "%02d%02d", split(/\./, $config{version}); + our $shlibvariant = $target{shlib_variant} || ""; + our $sourcedir = $config{sourcedir}; our $builddir = $config{builddir}; sub sourcefile { @@ -47,13 +49,13 @@ map { (my $x = $_) =~ s/\.a$//; $x } @{$unified_info{libraries}}; our @shlibs = - map { $unified_info{sharednames}->{$_} || () } + map { $unified_info{sharednames}->{$_}.$shlibvariant || () } grep(!/\.a$/, @{$unified_info{libraries}}); our @install_libs = map { (my $x = $_) =~ s/\.a$//; $x } @{$unified_info{install}->{libraries}}; our @install_shlibs = - map { $unified_info{sharednames}->{$_} || () } + map { $unified_info{sharednames}->{$_}.$shlibvariant || () } grep(!/\.a$/, @{$unified_info{install}->{libraries}}); # This is a horrible hack, but is needed because recursive inclusion of files @@ -695,7 +697,7 @@ reconfigure reconf : } return map { $_ =~ /\.a$/ ? $`.".OLB" - : $unified_info{sharednames}->{$_}.".EXE" } @_; + : $unified_info{sharednames}->{$_}.$shlibvariant.".EXE" } @_; } # Helper function to deal with inclusion directory specs. @@ -912,7 +914,7 @@ EOF sub libobj2shlib { my %args = @_; my $lib = $args{lib}; - my $shlib = $args{shlib}; + my $shlib = $args{shlib}.$shlibvariant; my $libd = dirname($lib); my $libn = basename($lib); my @objs = map { (my $x = $_) =~ s|\.o$|.OBJ|; $x } diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 13716e0644..f7a6652996 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -9,6 +9,7 @@ our $exeext = $target{exe_extension} || ".exe"; our $libext = $target{lib_extension} || ".lib"; our $shlibext = $target{shared_extension} || ".dll"; + our $shlibvariant = $target{shlib_variant} || ""; our $shlibextimport = $target{shared_import_extension} || ".lib"; our $dsoext = $target{dso_extension} || ".dll"; @@ -35,7 +36,7 @@ my $lib = shift; return () if $disabled{shared} || $lib =~ /\.a$/; return () unless defined $unified_info{sharednames}->{$lib}; - return $unified_info{sharednames}->{$lib} . $shlibext; + return $unified_info{sharednames}->{$lib} . $shlibvariant . $shlibext; } sub lib { |