From 931391995f6bfe3947244a22b9ba9c63897d3cd9 Mon Sep 17 00:00:00 2001 From: Aphek Date: Tue, 4 Feb 2025 01:28:45 -0300 Subject: [PATCH 1/3] feat: Use vitasdk's pkg-config wrapper so that VITASDK variable gets set See https://github.com/rust-lang/pkg-config-rs/blob/3314c8de34cbd459caf8c8a5ae4e94efa9037e3a/src/lib.rs#L290-L293 --- src/commands/build.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/commands/build.rs b/src/commands/build.rs index 28a62ff..34b9cc9 100644 --- a/src/commands/build.rs +++ b/src/commands/build.rs @@ -233,9 +233,7 @@ impl<'a> BuildContext<'a> { .pass_path_env("OPENSSL_INCLUDE_DIR", || { self.sdk("arm-vita-eabi").join("include") }) - .pass_path_env("PKG_CONFIG_PATH", || { - self.sdk("arm-vita-eabi").join("lib").join("pkgconfig") - }) + .pass_path_env("PKG_CONFIG", || self.sdk_binary("arm-vita-eabi-pkg-config")) .pass_env("PKG_CONFIG_SYSROOT_DIR", || &self.sdk) .env("VITASDK", &self.sdk) .arg("build") From cae43c6a6b6a633bfddf371f522a7871621467c4 Mon Sep 17 00:00:00 2001 From: Aphek Date: Tue, 4 Feb 2025 01:46:44 -0300 Subject: [PATCH 2/3] fix: Clippy lint --- src/commands/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/build.rs b/src/commands/build.rs index 34b9cc9..f7e8653 100644 --- a/src/commands/build.rs +++ b/src/commands/build.rs @@ -205,7 +205,7 @@ impl Executor for Build { } } -impl<'a> BuildContext<'a> { +impl BuildContext<'_> { fn build_elf(&self) -> anyhow::Result> { let cargo = env::var("CARGO").unwrap_or_else(|_| "cargo".to_string()); From e63b70bb3e8e79b39f922040a588c677e059dd70 Mon Sep 17 00:00:00 2001 From: Aphek Date: Sat, 8 Feb 2025 20:30:14 -0300 Subject: [PATCH 3/3] chore: Remove unused PKG_CONFIG_SYSROOT_DIR --- src/commands/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/commands/build.rs b/src/commands/build.rs index f7e8653..1f35419 100644 --- a/src/commands/build.rs +++ b/src/commands/build.rs @@ -234,7 +234,6 @@ impl BuildContext<'_> { self.sdk("arm-vita-eabi").join("include") }) .pass_path_env("PKG_CONFIG", || self.sdk_binary("arm-vita-eabi-pkg-config")) - .pass_env("PKG_CONFIG_SYSROOT_DIR", || &self.sdk) .env("VITASDK", &self.sdk) .arg("build") .arg("-Z")