3.1.48.4bi

Author: pmp-p

scripts/cpython-build-emsdk.sh

@@ -344,7 +344,9 @@ else
     . ${SDKROOT}/config
     . ${SDKROOT}/emsdk/emsdk_env.sh
     export PATH=$SDKROOT/emsdk/upstream/emscripten:$SDKROOT/emsdk/upstream/emscripten/system/bin:\$PATH
-    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+    export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk"
+    export PKG_CONFIG_LIBDIR="${SDKROOT}/emsdk/upstream/emscripten/system/lib/pkgconfig"
+    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
     export NODE=\$(find \$EMSDK|grep /bin/node\$)
 fi
 

scripts/emsdk-fetch.sh

@@ -420,7 +420,7 @@ END
 
     export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk"
     export PKG_CONFIG_LIBDIR="${SDKROOT}/emsdk/upstream/emscripten/system/lib/pkgconfig"
-    export PKG_CONFIG_PATH="${SDKROOT}/devices/emsdk/usr/lib//pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
+    export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
 
     if echo $PATH|grep -q $EMSDK/upstream/emscripten/system/bin
     then