mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-25 20:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adapt all the exporter files to the new vars from util/mkinstallvars.pl

Browse Source 
With this, the pkg-config files take better advantage of relative directory
values.

Fixes #24298

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24687)
This commit is contained in:
Richard Levitte 2024-06-20 14:33:15 +02:00 committed by Tomas Mraz
parent 6e0fd246e7
commit 30dc37d798
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
exporters/cmake/OpenSSLConfig.cmake.in
View File

@ -89,9 +89,10 @@ unset(_ossl_undefined_targets)
# Set up the import path, so all other import paths are made relative this file
get_filename_component(_ossl_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
{-
# For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR_REL, have CMake
# out the parent directory.
my $d = unixify($OpenSSL::safe::installdata::CMAKECONFIGDIR_REL);
# For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR relative to
# $OpenSSL::safe::installdata::PREFIX, have CMake figure out the parent directory.
my $d = join('/', unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX),
unixify($OpenSSL::safe::installdata::CMAKECONFIGDIR_REL_LIBDIR));
$OUT = '';
$OUT .= 'get_filename_component(_ossl_prefix "${_ossl_prefix}" PATH)' . "\n"
foreach (split '/', $d);

12
exporters/pkg-config/libcrypto.pc.in
View File

@ -1,7 +1,11 @@
libdir={- $OpenSSL::safe::installdata::LIBDIR -}
includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -}
enginesdir={- $OpenSSL::safe::installdata::ENGINESDIR -}
modulesdir={- $OpenSSL::safe::installdata::MODULESDIR -}
prefix={- $OpenSSL::safe::installdata::PREFIX -}
exec_prefix=${prefix}
libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
: $OpenSSL::safe::installdata::libdir -}
includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -}
enginesdir=${libdir}/{- $OpenSSL::safe::installdata::ENGINESDIR_REL_LIBDIR -}
modulesdir=${libdir}/{- $OpenSSL::safe::installdata::MODULESDIR_REL_LIBDIR -}
Name: OpenSSL-libcrypto
Description: OpenSSL cryptography library

8
exporters/pkg-config/libssl.pc.in
View File

@ -1,5 +1,9 @@
libdir={- $OpenSSL::safe::installdata::LIBDIR -}
includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -}
prefix={- $OpenSSL::safe::installdata::PREFIX -}
exec_prefix=${prefix}
libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
: $OpenSSL::safe::installdata::libdir -}
includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -}
Name: OpenSSL-libssl
Description: Secure Sockets Layer and cryptography libraries

8
exporters/pkg-config/openssl.pc.in
View File

@ -1,5 +1,9 @@
libdir={- $OpenSSL::safe::installdata::LIBDIR -}
includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -}
prefix={- $OpenSSL::safe::installdata::PREFIX -}
exec_prefix=${prefix}
libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
: $OpenSSL::safe::installdata::libdir -}
includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -}
Name: OpenSSL
Description: Secure Sockets Layer and cryptography libraries and tools