Skip to contentSkip to conversation

toolchain-scripts-mingw32: add /usr/share/pkgconfig

PATCH In review Ross Stutterheim 2 participants 2 messages Jul 8

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 toolchain-scripts-mingw32: add /usr/share/pkgconfig

poky commit e0bcf333df8bccbc7aca39048423d97247454c5e added /usr/share/pkgconfig to PKG_CONFIG_PATH back in 2016. Add here so SDKs generated for windows can find the same packages as SDKs for linux when using pkg-config after sourcing the environment-setup script.

---
 classes/toolchain-scripts-mingw32.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
classes/toolchain-scripts-mingw32.bbclass +1 -1
index 8cb426a..ee53bf8 100644
@@ -25,7 +25,7 @@ toolchain_create_sdk_env_script:sdkmingw32 () {
 	done
 	echo "set PATH=$sdkpathnative$bindir;$sdkpathnative$bindir/../${HOST_SYS}/bin;$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH';%PATH%' >> $script
 	echo 'set PKG_CONFIG_SYSROOT_DIR=%SDKTARGETSYSROOT%' >> $script
-	echo 'set PKG_CONFIG_PATH=%SDKTARGETSYSROOT%'"$libdir"'/pkgconfig' >> $script
+	echo 'set PKG_CONFIG_PATH=%SDKTARGETSYSROOT%'"$libdir"'/pkgconfig;%SDKTARGETSYSROOT%'"$prefix"'/share/pkgconfig' >> $script
 	echo 'set CONFIG_SITE=%SDKROOT%/site-config-'"${multimach_target_sys}" >> $script
 	echo "set OECORE_NATIVE_SYSROOT=$sdkpathnative" >> $script
 	echo 'set OECORE_TARGET_SYSROOT=%SDKTARGETSYSROOT%' >> $script
Signature · 1 line
2.54.0
#1 lore raw
Quoted 2 lines · Ross Stutterheim

poky commit e0bcf333df8bccbc7aca39048423d97247454c5e added

FYI: poky repo is no longer used so I updated the commit message to OE core 1bea760f3f462fdcc3eefc0d8597688d61447ddd for you

Otherwise, LGTM; I'll run it through the test suite just to be sure

Quoted 33 lines

/usr/share/pkgconfig to PKG_CONFIG_PATH back in 2016. Add here so SDKs generated for windows can find the same packages as SDKs for linux when using pkg-config after sourcing the environment-setup script.

---
 classes/toolchain-scripts-mingw32.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
classes/toolchain-scripts-mingw32.bbclass +0 -0
index 8cb426a..ee53bf8 100644
@@ -25,7 +25,7 @@ toolchain_create_sdk_env_script:sdkmingw32 () {
        done
        echo "set

PATH=$sdkpathnative$bindir;$sdkpathnative$bindir/../${HOST_SYS}/bin;$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH';%PATH%'

Quoted 1 line
Quoted 1 line

$script

echo 'set PKG_CONFIG_SYSROOT_DIR=%SDKTARGETSYSROOT%' >> $script
- echo 'set PKG_CONFIG_PATH=%SDKTARGETSYSROOT%'"$libdir"'/pkgconfig'

Quoted 1 line
Quoted 1 line

$script

+ echo 'set
PKG_CONFIG_PATH=%SDKTARGETSYSROOT%'"$libdir"'/pkgconfig;%SDKTARGETSYSROOT%'"$prefix"'/share/pkgconfig'

Quoted 1 line
Quoted 1 line

$script

echo 'set
CONFIG_SITE=%SDKROOT%/site-config-'"${multimach_target_sys}" >> $script
echo "set OECORE_NATIVE_SYSROOT=$sdkpathnative" >> $script echo 'set OECORE_TARGET_SYSROOT=%SDKTARGETSYSROOT%' >> $script
--
2.54.0