public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exporters for pkg-config: align with the changes for CMake

Browse source 
The latest CMake exporter changes reworked the the variables in builddata.pm
and installdata.pm.  Unfortunately, the pkg-config exporter templates were
forgotten in that effort.

Fixes #25299

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25308)
This commit is contained in:
Richard Levitte 2024-08-28 18:52:39 +02:00
parent 0b97a5505e
commit 15b748496f
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
exporters/pkg-config/libcrypto.pc.in
View file

@ -1,8 +1,13 @@
prefix={- $OpenSSL::safe::installdata::PREFIX[0] -} prefix={- $OpenSSL::safe::installdata::PREFIX[0] -}
exec_prefix=${prefix} exec_prefix=${prefix}
libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0] libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) {
? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0] my $x = '';
: $OpenSSL::safe::installdata::libdir[0] -} $x = '/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]
if $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0];
'${exec_prefix}' . $x;
} else {
$OpenSSL::safe::installdata::libdir[0];
} -}
includedir={- $OUT = ''; includedir={- $OUT = '';
$OUT .= '${prefix}/' . $_ . ' ' $OUT .= '${prefix}/' . $_ . ' '
foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -} foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -}

13
exporters/pkg-config/libssl.pc.in
View file

@ -1,8 +1,13 @@
prefix={- $OpenSSL::safe::installdata::PREFIX -} prefix={- $OpenSSL::safe::installdata::PREFIX[0] -}
exec_prefix=${prefix} exec_prefix=${prefix}
libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) {
? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX my $x = '';
: $OpenSSL::safe::installdata::libdir -} $x = '/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]
if $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0];
'${exec_prefix}' . $x;
} else {
$OpenSSL::safe::installdata::libdir[0];
} -}
includedir={- $OUT = ''; includedir={- $OUT = '';
$OUT .= '${prefix}/' . $_ . ' ' $OUT .= '${prefix}/' . $_ . ' '
foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -} foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -}

17
exporters/pkg-config/openssl.pc.in
View file

@ -1,9 +1,16 @@
prefix={- $OpenSSL::safe::installdata::PREFIX -} prefix={- $OpenSSL::safe::installdata::PREFIX[0] -}
exec_prefix=${prefix} exec_prefix=${prefix}
libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) {
? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX my $x = '';
: $OpenSSL::safe::installdata::libdir -} $x = '/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]
includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -} if $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0];
'${exec_prefix}' . $x;
} else {
$OpenSSL::safe::installdata::libdir[0];
} -}
includedir={- $OUT = '';
$OUT .= '${prefix}/' . $_ . ' '
foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -}
Name: OpenSSL Name: OpenSSL
Description: Secure Sockets Layer and cryptography libraries and tools Description: Secure Sockets Layer and cryptography libraries and tools