diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-05-17 14:25:12 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-05-19 10:13:02 +0200 |
| commit | da51dc5f68c9e7924be3d5071ba8aea439a4d1c9 (patch) | |
| tree | 7ed68e17fb2f48e22bccfe73f097468c85cce4b4 /Configurations | |
| parent | 8a734d3aaf4e4784581b87cdf2a4b3e2c2403b97 (diff) | |
Move some OpenSSL perl utility functions to OpenSSL::Util
quotify1() and quotify_l() were in OpenSSL::Template, but should be
more widely usable.
configdata.pm.in's out_item() is also more widely useful and is
therefore moved to OpenSSL::Util as well, and renamed to dump_data().
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15310)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 1 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 920c0abfeb..a357ae5c3b 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -4,6 +4,7 @@ {- use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/; use File::Basename; + use OpenSSL::Util; (our $osslprefix_q = platform->osslprefix()) =~ s/\$/\\\$/; diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index f729416d1d..8b45e75f57 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -3,6 +3,8 @@ ## ## {- join("\n## ", @autowarntext) -} {- + use OpenSSL::Util; + our $makedep_scheme = $config{makedep_scheme}; our $makedepcmd = platform->makedepcmd(); diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 014c1eb8d1..a7123f6a5e 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -4,6 +4,7 @@ ## {- join("\n## ", @autowarntext) -} {- use File::Basename; + use OpenSSL::Util; our $sover_dirname = platform->shlib_version_as_filename(); |