Removes trailing whitespace from generated pkg-config .pc files

Fixes #29993

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Wed Feb 25 09:53:18 2026
(Merged from https://github.com/openssl/openssl/pull/30087)

diff --git a/exporters/pkg-config/libcrypto.pc.in b/exporters/pkg-config/libcrypto.pc.in
index 952bd8130ce37070a5d9dc7d32c51b3633fab8b1..cb00b749d1c009760b6c036d45854eacc11f9dba 100644 (file)
--- a/exporters/pkg-config/libcrypto.pc.in
+++ b/exporters/pkg-config/libcrypto.pc.in
@@ -10,7 +10,8 @@ libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) {
           } -}
 includedir={- $OUT = '';
               $OUT .= '${prefix}/' . $_ . ' '
-                  foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -}
+                  foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX);
+              $OUT =~ s/\s+\z//; -}
 modulesdir=${libdir}/{- $OpenSSL::safe::installdata::MODULESDIR_REL_LIBDIR[0] -}
 
 Name: OpenSSL-libcrypto
@@ -23,4 +24,5 @@ Cflags:{- $OUT = ' -I${includedir}';
               $OUT = '';
               $OUT .= ' -I${prefix}/' . $_ . ' '
                   foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX);
+              $OUT =~ s/\s+\z//;
           } -}

diff --git a/exporters/pkg-config/libssl.pc.in b/exporters/pkg-config/libssl.pc.in
index 162db65c99a2afe3978412b5fb34a9f1343d7a69..f73be2e9f2aa0e463b802d99814e1de45860ecc9 100644 (file)
--- a/exporters/pkg-config/libssl.pc.in
+++ b/exporters/pkg-config/libssl.pc.in
@@ -10,7 +10,8 @@ libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) {
           } -}
 includedir={- $OUT = '';
               $OUT .= '${prefix}/' . $_ . ' '
-                  foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -}
+                  foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX);
+              $OUT =~ s/\s+\z//; -}
 
 Name: OpenSSL-libssl
 Description: Secure Sockets Layer and cryptography libraries
@@ -22,4 +23,5 @@ Cflags:{- $OUT = ' -I${includedir}';
               $OUT = '';
               $OUT .= ' -I${prefix}/' . $_ . ' '
                   foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX);
+              $OUT =~ s/\s+\z//;
           } -}

diff --git a/exporters/pkg-config/openssl.pc.in b/exporters/pkg-config/openssl.pc.in
index 73eb8e73c2d27d62c08e9cc1eda2d00fb2c8e1fa..d41eea7e3a1a9be2c6dac26931e9347f507896fd 100644 (file)
--- a/exporters/pkg-config/openssl.pc.in
+++ b/exporters/pkg-config/openssl.pc.in
@@ -10,7 +10,8 @@ libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) {
           } -}
 includedir={- $OUT = '';
               $OUT .= '${prefix}/' . $_ . ' '
-                  foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -}
+                  foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX);
+              $OUT =~ s/\s+\z//; -}
 
 Name: OpenSSL
 Description: Secure Sockets Layer and cryptography libraries and tools