diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-09-08 09:40:37 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-09-09 12:07:33 +0200 |
| commit | 435981cbadad2c58c35bacd30ca5d8b4c9bea72f (patch) | |
| tree | f79eda191df45cb124ceffd8c1882f9f246b34bf /Configurations/descrip.mms.tmpl | |
| parent | 2fe2279d1f3bbfa934e432d4f2c3a7e6a6b0f958 (diff) | |
OpenSSL::Ordinals::set_version() should only be given the short version
This function tried to shave off the pre-release and build metadata
text from the the version number it gets, but didn't do that quite
right. Since this isn't even a documented behaviour, the easier, and
arguably more correct path is for that function not to try to shave
off anything, and for the callers to feed it the short version number,
"{MAJOR}.{MINOR}.{PATCH}", nothing more.
The build file templates are adjusted accordingly.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16556)
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 3db0fc7286..42dea4752a 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -267,6 +267,7 @@ VERBOSE=$(V) VERBOSE_FAILURE=$(VF) VERSION={- "$config{full_version}" -} +VERSION_NUMBER={- "$config{version}" -} MAJOR={- $config{major} -} MINOR={- $config{minor} -} SHLIB_VERSION_NUMBER={- $config{shlib_version} -} @@ -904,7 +905,7 @@ EOF # my $target = platform->def($args{src}); my $mkdef = sourcefile('util', 'mkdef.pl'); - my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION)' : ''; + my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION_NUMBER)' : ''; my $ord_name = $args{generator}->[1] || basename($args{product}, '.EXE'); my $case_insensitive = |