From 5e1e05c694d142e423cb60b986245fb0da7367de Mon Sep 17 00:00:00 2001
From: Sergey Dolin <sergey.dolin@gmail.com>
Date: Tue, 3 May 2022 16:04:39 +0500
Subject: [PATCH] set PKG_CONFIG_PATH environment var
---
dist/setup/index.js | 2 ++
src/find-pypy.ts | 1 +
src/find-python.ts | 1 +
3 files changed, 4 insertions(+)
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 7c47a470..141ba7d5 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -52374,6 +52374,7 @@ function findPyPyVersion(versionSpec, architecture) {
const _binDir = path.join(installDir, pipDir);
const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
core.exportVariable('pythonLocation', pythonLocation);
+ core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
core.addPath(pythonLocation);
core.addPath(_binDir);
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
@@ -57009,6 +57010,7 @@ function useCpythonVersion(version, architecture) {
].join(os.EOL));
}
core.exportVariable('pythonLocation', installDir);
+ core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
if (utils_1.IS_LINUX) {
const libPath = process.env.LD_LIBRARY_PATH
? `:${process.env.LD_LIBRARY_PATH}`
diff --git a/src/find-pypy.ts b/src/find-pypy.ts
index 75b6abb0..fd273825 100644
--- a/src/find-pypy.ts
+++ b/src/find-pypy.ts
@@ -50,6 +50,7 @@ export async function findPyPyVersion(
const _binDir = path.join(installDir, pipDir);
const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
core.exportVariable('pythonLocation', pythonLocation);
+ core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
core.addPath(pythonLocation);
core.addPath(_binDir);
core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
diff --git a/src/find-python.ts b/src/find-python.ts
index b8175a43..3959ecf1 100644
--- a/src/find-python.ts
+++ b/src/find-python.ts
@@ -70,6 +70,7 @@ export async function useCpythonVersion(
}
core.exportVariable('pythonLocation', installDir);
+ core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');
if (IS_LINUX) {
const libPath = process.env.LD_LIBRARY_PATH