From c6c65062ec7bdd95f04b63a6b7ad7f874398e21c Mon Sep 17 00:00:00 2001
From: Andrew Garner <andrew.garner@broadcom.com>
Date: Fri, 5 Jun 2026 20:53:55 -0500
Subject: [PATCH] Configure pkgconf with multiarch pkg-config and library
 search paths

The original pkg-config build included --with-pc-path to search
/usr/lib/x86_64-linux-gnu/pkgconfig. When switching to pkgconf, the
equivalent --with-pkg-config-dir flag was not included, so pkgconf
omitted the multiarch path from its compiled-in defaults.

On ubuntu-noble, cmake 3.28's FindOpenSSL uses pkg-config to resolve
the library directory hint. Without openssl.pc visible to pkgconf,
cmake could not locate OPENSSL_CRYPTO_LIBRARY despite libssl-dev being
installed, causing the percona-xtrabackup builds to fail at the libkmip
cmake configure step.
---
 packages/percona-xtrabackup-8.0/packaging     | 5 ++++-
 packages/percona-xtrabackup-8.4/packaging     | 5 ++++-
 packages/percona-xtradb-cluster-8.0/packaging | 5 ++++-
 packages/percona-xtradb-cluster-8.4/packaging | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/percona-xtrabackup-8.0/packaging b/packages/percona-xtrabackup-8.0/packaging
index 59a58446e..dfc6e36c7 100755
--- a/packages/percona-xtrabackup-8.0/packaging
+++ b/packages/percona-xtrabackup-8.0/packaging
@@ -12,7 +12,10 @@ main() {
 install_build_dependencies() {
   tar -xf pkgconf-*.tar.xz
   cd pkgconf-*/
-  ./configure --prefix=/usr
+  ./configure \
+    --prefix=/usr \
+    --with-pkg-config-dir=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig \
+    --with-system-libdir=/usr/lib/x86_64-linux-gnu:/usr/lib
   make -j "$(nproc)" install
   ln -sf pkgconf /usr/bin/pkg-config
   cd -
diff --git a/packages/percona-xtrabackup-8.4/packaging b/packages/percona-xtrabackup-8.4/packaging
index 85a5cffc6..e12f2e76b 100644
--- a/packages/percona-xtrabackup-8.4/packaging
+++ b/packages/percona-xtrabackup-8.4/packaging
@@ -12,7 +12,10 @@ main() {
 install_build_dependencies() {
   tar -xf pkgconf-*.tar.xz
   cd pkgconf-*/
-  ./configure --prefix=/usr
+  ./configure \
+    --prefix=/usr \
+    --with-pkg-config-dir=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig \
+    --with-system-libdir=/usr/lib/x86_64-linux-gnu:/usr/lib
   make -j "$(nproc)" install
   ln -sf pkgconf /usr/bin/pkg-config
   cd -
diff --git a/packages/percona-xtradb-cluster-8.0/packaging b/packages/percona-xtradb-cluster-8.0/packaging
index 1201b8438..e64f5fd29 100644
--- a/packages/percona-xtradb-cluster-8.0/packaging
+++ b/packages/percona-xtradb-cluster-8.0/packaging
@@ -13,7 +13,10 @@ main() {
 install_build_dependencies() {
   tar -xf pkgconf-*.tar.xz
   cd pkgconf-*/
-  ./configure --prefix=/usr
+  ./configure \
+    --prefix=/usr \
+    --with-pkg-config-dir=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig \
+    --with-system-libdir=/usr/lib/x86_64-linux-gnu:/usr/lib
   make -j "$(nproc)" install
   ln -sf pkgconf /usr/bin/pkg-config
   cd -
diff --git a/packages/percona-xtradb-cluster-8.4/packaging b/packages/percona-xtradb-cluster-8.4/packaging
index e719cdea8..312f00df1 100644
--- a/packages/percona-xtradb-cluster-8.4/packaging
+++ b/packages/percona-xtradb-cluster-8.4/packaging
@@ -13,7 +13,10 @@ main() {
 install_build_dependencies() {
   tar -xf pkgconf-*.tar.xz
   cd pkgconf-*/
-  ./configure --prefix=/usr
+  ./configure \
+    --prefix=/usr \
+    --with-pkg-config-dir=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig \
+    --with-system-libdir=/usr/lib/x86_64-linux-gnu:/usr/lib
   make -j "$(nproc)" install
   ln -sf pkgconf /usr/bin/pkg-config
   cd -