From 6181d7bb08af09f04ddd2852e9a022f58852a86d Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 22 Feb 2023 11:56:38 +0100 Subject: [PATCH 1/2] Install wasm libraries in `INSTALL/lib` directory. The default detected libdir is based on the build architecture. On ubuntu, it is `lib/x86_64-linux-gnu` which is obviously not the right directory. Let's simply use `lib`. Fix #556 --- kiwixbuild/platforms/wasm.py | 1 + 1 file changed, 1 insertion(+) diff --git a/kiwixbuild/platforms/wasm.py b/kiwixbuild/platforms/wasm.py index 31b71a6..ea2e4cd 100644 --- a/kiwixbuild/platforms/wasm.py +++ b/kiwixbuild/platforms/wasm.py @@ -9,6 +9,7 @@ class WasmPlatformInfo(PlatformInfo): static = True build = 'wasm' arch_full = 'wasm64-emscripten' + libdir = "lib" #arch_full = 'wasm64-linux' toolchain_names = ['emsdk'] compatible_hosts = ['fedora', 'debian'] From 674c29c351f769e333a6822b4b9de9b52470ac7b Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 1 Mar 2023 14:17:48 +0100 Subject: [PATCH 2/2] Bump the base_deps_meta_version. As we install base library in a different directory, we have to regenereate the base_deps archives. --- kiwixbuild/versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 70ac5b4..fad7866 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -39,7 +39,7 @@ release_versions = { # This is the "version" of the whole base_deps_versions dict. # Change this when you change base_deps_versions. -base_deps_meta_version = '80' +base_deps_meta_version = '81' base_deps_versions = { 'zlib' : '1.2.12',