diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-07-19 10:13:41 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-07-26 22:53:03 +0200 |
| commit | d445302418b41b76c15e103954b1311d98077480 (patch) | |
| tree | 3fe29109a41dbe6af982bc15e6592df700316f17 /VMS | |
| parent | 00606b06d5209368d1bd2fcab70bf6d9e2fe875f (diff) | |
| download | openssl-new-d445302418b41b76c15e103954b1311d98077480.tar.gz | |
Simplify the handling of shared library version numbers
$(SHLIB_MAJOR).$(SHLIB_MINOR) is really a synonym for
$(SHLIB_VERSION_NUMBER), and is therefore an added complexity,
so better to use $(SHLIB_VERSION_NUMBER) directly. SHLIB_MAJOR and
SHLIB_MINOR are now unused, but are kept around purely as information
in case someone relies on their existence.
At the same time, add support for custom shared library extensions
with the three new Makefile variables SHLIB_EXT, SHLIB_EXT_SIMPLE and
SHLIB_EXT_IMPORT. By default, they hold the variants of shared
library extensions we support. On mingw and cygwin, SHLIB_EXT_IMPORT
is defined; on all other Unix platforms, it's empty.
An example to get shared libraries with a slightly different SOVER name:
$ make SHLIB_EXT='.$(SHLIB_VERSION_NUMBER).so'
Fixes #3902
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3964)
Diffstat (limited to 'VMS')
| -rw-r--r-- | VMS/openssl_shutdown.com.in | 2 | ||||
| -rw-r--r-- | VMS/openssl_startup.com.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in index f0df1c1c35..fd4e3d5086 100644 --- a/VMS/openssl_shutdown.com.in +++ b/VMS/openssl_shutdown.com.in @@ -26,7 +26,7 @@ $ ENDIF $ $ ! Abbrevs $ DEAS := DEASSIGN /NOLOG 'P1' -$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -} +$ sv := {- sprintf "%02d%02d", split m|\.|, $config{shlib_version_number} -} $ pz := {- $config{pointer_size} -} $ $ DEAS OSSL$DATAROOT diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index 9c8c09ac9c..9e6e1c0b35 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -88,7 +88,7 @@ $ $ ! Abbrevs $ DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1' $ DEF := DEFINE /NOLOG 'P1' -$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -} +$ sv := {- sprintf "%02d%02d", split m|\.|, $config{shlib_version_number} -} $ pz := {- $config{pointer_size} -} $ $ DEFT OSSL$DATAROOT 'OPENSSLDIR_'] |