openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

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)
This commit is contained in:
Richard Levitte 2023-04-14 08:42:08 +02:00 committed by Hugo Landau
parent 8daa2616bb
commit 58440f74e1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Configurations/descrip.mms.tmpl
View File

@ -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 }

3
Configurations/windows-makefile.tmpl
View File

@ -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 {