[PATCH] tests: use correct pkg-config when cross compiling

[PATCH] tests: use correct pkg-config when cross compiling

[Alyssa Ross]

By convention, the PKG_CONFIG environment variable is used to tell
build systems which pkg-config executable should be used.  This is
often used when cross compiling, where it might be set to something
like "aarch64-unknown-linux-gnu-pkg-config".

Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
 tests/run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index bb2ec95..3225a12 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -32,7 +32,7 @@ if [ -n "$NO_YAML" ]; then
         no_yaml=false
     fi
 else
-    if pkg-config --atleast-version 0.2.3 yaml-0.1; then
+    if ${PKG_CONFIG:-pkg-config} --atleast-version 0.2.3 yaml-0.1; then
         no_yaml=false
     else
         no_yaml=true

base-commit: 95c74d71f0904235d44892627322f60a18c9a28c
-- 
2.43.0

Re: [PATCH] tests: use correct pkg-config when cross compiling

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1180 bytes --]

On Tue, Jan 23, 2024 at 02:04:10PM +0100, Alyssa Ross wrote:
> By convention, the PKG_CONFIG environment variable is used to tell
> build systems which pkg-config executable should be used.  This is
> often used when cross compiling, where it might be set to something
> like "aarch64-unknown-linux-gnu-pkg-config".
> 
> Signed-off-by: Alyssa Ross <hi@alyssa.is>

Applied, thanks.

> ---
>  tests/run_tests.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/run_tests.sh b/tests/run_tests.sh
> index bb2ec95..3225a12 100755
> --- a/tests/run_tests.sh
> +++ b/tests/run_tests.sh
> @@ -32,7 +32,7 @@ if [ -n "$NO_YAML" ]; then
>          no_yaml=false
>      fi
>  else
> -    if pkg-config --atleast-version 0.2.3 yaml-0.1; then
> +    if ${PKG_CONFIG:-pkg-config} --atleast-version 0.2.3 yaml-0.1; then
>          no_yaml=false
>      else
>          no_yaml=true
> 
> base-commit: 95c74d71f0904235d44892627322f60a18c9a28c

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]