Merge pull request #400 from akv-platform/v-sedoli/pkg-config

marko-zivic-93 · web-flow · commit ae11205ec6e7 · 2022-05-04T09:56:28.000+02:00
set PKG_CONFIG_PATH environment var
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ export async function useCpythonVersion(`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`core.exportVariable('pythonLocation', installDir);`
	`73`	`+ core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');`
`73`	`74`
`74`	`75`	`if (IS_LINUX) {`
`75`	`76`	`const libPath = process.env.LD_LIBRARY_PATH`