From 780681db67d4bc81d83245d4be35d0cc1341a57d Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Mon, 15 May 2023 12:27:41 +0200
Subject: Third-party descriptions: be flexible on PKG_CONFIG_PATH

Using only our third-party descriptions, the build is independent of
PKG_CONFIG_PATH. However, when combinging our third-party descriptions
with dependencies taken from the system via pkg-config there is a
dependency of PKG_CONFIG_PATH due to those indirect dependencies.
Therefore, allow flexible PKG_CONFIG_PATH to support such a mixed
bootstrapping.
---
 etc/import/TARGETS.archive  | 1 +
 etc/import/TARGETS.cares    | 1 +
 etc/import/TARGETS.curl     | 1 +
 etc/import/TARGETS.git2     | 1 +
 etc/import/TARGETS.grpc     | 4 ++++
 etc/import/TARGETS.protobuf | 4 ++++
 6 files changed, 12 insertions(+)

diff --git a/etc/import/TARGETS.archive b/etc/import/TARGETS.archive
index 88c6391c..af2dc82b 100644
--- a/etc/import/TARGETS.archive
+++ b/etc/import/TARGETS.archive
@@ -42,6 +42,7 @@
     , "ENABLE_RICHACL"
     , "USE_NFS4"
     , "HIDE_SYMBOLS"
+    , "PKG_CONFIG_ARGS"
     ]
   , "config_doc":
     { "ENABLE_MBEDTLS":
diff --git a/etc/import/TARGETS.cares b/etc/import/TARGETS.cares
index 91d4271d..ac27e698 100644
--- a/etc/import/TARGETS.cares
+++ b/etc/import/TARGETS.cares
@@ -13,6 +13,7 @@
     , "AR"
     , "ENV"
     , "BUILD_POSITION_INDEPENDENT"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 }
diff --git a/etc/import/TARGETS.curl b/etc/import/TARGETS.curl
index e77f0ef1..7cf92daa 100644
--- a/etc/import/TARGETS.curl
+++ b/etc/import/TARGETS.curl
@@ -59,6 +59,7 @@
     , "HAVE_SSL_CTX_SET_QUIC_METHOD"
     , "HAVE_QUICHE_CONN_SET_QLOG_FD"
     , "HAVE_ZSTD_CREATEDSTREAM"
+    , "PKG_CONFIG_ARGS"
     ]
   , "config_doc":
     { "CURL_HIDDEN_SYMBOLS":
diff --git a/etc/import/TARGETS.git2 b/etc/import/TARGETS.git2
index c34b02fe..0d15117f 100644
--- a/etc/import/TARGETS.git2
+++ b/etc/import/TARGETS.git2
@@ -31,6 +31,7 @@
     , "USE_HTTPS"
     , "USE_HTTP_PARSER"
     , "USE_BUNDLED_ZLIB"
+    , "PKG_CONFIG_ARGS"
     ]
   , "config_doc":
     { "REGEX_BACKEND":
diff --git a/etc/import/TARGETS.grpc b/etc/import/TARGETS.grpc
index 2341dfd1..d23ad660 100644
--- a/etc/import/TARGETS.grpc
+++ b/etc/import/TARGETS.grpc
@@ -71,6 +71,7 @@
     , "ADD_CXXFLAGS"
     , "AR"
     , "ENV"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 , "grpc_internal":
@@ -163,6 +164,7 @@
     , "ADD_CXXFLAGS"
     , "AR"
     , "ENV"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 , "gpr_internal":
@@ -323,6 +325,7 @@
     , "ADD_CXXFLAGS"
     , "AR"
     , "ENV"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 , "grpc++internal":
@@ -2275,6 +2278,7 @@
     , "ADD_CXXFLAGS"
     , "AR"
     , "ENV"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 }
diff --git a/etc/import/TARGETS.protobuf b/etc/import/TARGETS.protobuf
index 15f7e6d7..3c7da355 100644
--- a/etc/import/TARGETS.protobuf
+++ b/etc/import/TARGETS.protobuf
@@ -22,6 +22,7 @@
     , "CC"
     , "CFLAGS"
     , "ADD_CFLAGS"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 , "libprotoc":
@@ -43,6 +44,7 @@
     , "CC"
     , "CFLAGS"
     , "ADD_CFLAGS"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 , "libprotobuf":
@@ -63,6 +65,7 @@
     , "CC"
     , "CFLAGS"
     , "ADD_CFLAGS"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 , "libprotobuf_lite":
@@ -83,6 +86,7 @@
     , "CC"
     , "CFLAGS"
     , "ADD_CFLAGS"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 , "toolchain_headers": {"type": "install", "deps": ["libprotobuf"]}
-- 
cgit v1.2.3