From 6b481aea2bf05f42a2fab0c0e29754ce5bbb45b1 Mon Sep 17 00:00:00 2001 From: Brainos Date: Tue, 9 Sep 2025 22:14:02 +0800 Subject: [PATCH 1/2] Use emmake wrapper for pkg-config in wasm --- renpybuild/run.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/renpybuild/run.py b/renpybuild/run.py index f6340588b..f251ff468 100644 --- a/renpybuild/run.py +++ b/renpybuild/run.py @@ -125,6 +125,8 @@ def build_environment(c): c.env("CFLAGS", "-O3 -I{{ install }}/include") c.env("LDFLAGS", "-O3 -L{{install}}/lib") + c.env("PKG_CONFIG", "pkg-config --static") + c.env("PATH", "{{ host }}/bin:{{ PATH }}") if (c.platform == "linux") and (c.arch == "x86_64"): @@ -387,6 +389,9 @@ def build_environment(c): c.env("EMSCRIPTEN_TOOLS", "{{emscriptenbin}}/tools") c.env("EMSCRIPTEN", "{{emscriptenbin}}") + # Use emscripten's wrapper to set correct search path for .pc files. + c.env("PKG_CONFIG", "emmake pkg-config --static") + c.env("PKG_CONFIG_LIBDIR", "{{cross}}/upstream/emscripten/cache/sysroot/lib/pkgconfig:{{cross}}/upstream/emscripten/system/lib/pkgconfig") # Add pkg-file search path for emscripten, since emscripten locked PKG_CONFIG_LIBDIR c.env("EM_PKG_CONFIG_PATH", "{{ install }}/lib/pkgconfig") @@ -406,8 +411,6 @@ def build_environment(c): c.env("PKG_CONFIG_LIBDIR", "{{ install }}/lib/pkgconfig:{{ PKG_CONFIG_LIBDIR }}") c.var("cmake_args", "{{cmake_args}} -DCMAKE_SYSTEM_NAME={{ cmake_system_name }} -DCMAKE_SYSTEM_PROCESSOR={{ cmake_system_processor }} -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY") - c.env("PKG_CONFIG", "pkg-config --static") - c.env("CFLAGS", "{{ CFLAGS }} -DRENPY_BUILD") c.env("CXXFLAGS", "{{ CFLAGS }}") From c628355ec5080ba92c26538ec508ca1d55036c6d Mon Sep 17 00:00:00 2001 From: Brainos Date: Wed, 17 Sep 2025 20:12:01 +0800 Subject: [PATCH 2/2] Add PKG_CONFIG_PATH to build environment for emscripten --- renpybuild/run.py | 1 + 1 file changed, 1 insertion(+) diff --git a/renpybuild/run.py b/renpybuild/run.py index f251ff468..5a3ebe8ba 100644 --- a/renpybuild/run.py +++ b/renpybuild/run.py @@ -395,6 +395,7 @@ def build_environment(c): c.env("PKG_CONFIG_LIBDIR", "{{cross}}/upstream/emscripten/cache/sysroot/lib/pkgconfig:{{cross}}/upstream/emscripten/system/lib/pkgconfig") # Add pkg-file search path for emscripten, since emscripten locked PKG_CONFIG_LIBDIR c.env("EM_PKG_CONFIG_PATH", "{{ install }}/lib/pkgconfig") + c.env("PKG_CONFIG_PATH", "{{ EM_PKG_CONFIG_PATH }}") # Tell emcc and em++ to use ccache when building c.env("EM_COMPILER_WRAPPER", "/usr/bin/ccache")