Skip to content

Commit e212751

Browse files
committed
pkg config fixes
1 parent b215e2b commit e212751

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

scripts/emsdk-fetch.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,9 @@ END
418418
# EM_PKG_CONFIG_PATH ?
419419
# https://emscripten.org/docs/compiling/Building-Projects.html#pkg-config
420420

421-
export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
421+
export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk"
422+
export PKG_CONFIG_LIBDIR="${SDKROOT}/emsdk/upstream/emscripten/system/lib/pkgconfig"
423+
export PKG_CONFIG_PATH="${SDKROOT}/devices/emsdk/usr/lib//pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
422424

423425
if echo $PATH|grep -q $EMSDK/upstream/emscripten/system/bin
424426
then
@@ -446,7 +448,6 @@ END
446448
fi
447449

448450
mkdir -p src
449-
export PKG_CONFIG_PATH="${SDKROOT}/emsdk/upstream/emscripten/system/lib/pkgconfig:${HOST_PREFIX}/lib/pkgconfig"
450451

451452
export CPPFLAGS="-I$PREFIX/include"
452453
export LDFLAGS="-L$PREFIX/lib"

sources.wasm/glib.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55

66
. ${CONFIG:-config}
77

8+
if which meson
9+
then
10+
echo meson found $(which meson)
11+
else
12+
$HPY -m pip install meson
13+
fi
14+
815
. scripts/emsdk-fetch.sh
916

1017
if pushd ${ROOT}/src

0 commit comments

Comments
 (0)