File tree Expand file tree Collapse file tree 3 files changed +4
-16
lines changed Expand file tree Collapse file tree 3 files changed +4
-16
lines changed Original file line number Diff line number Diff line change 8585 -DSQLITE_OMIT_TRUNCATE_OPTIMIZATION -DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_AUTHORIZATION"
8686 export CFLAGS="-DSQLITE_ENABLE_RTREE -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
8787 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA $OPT_FEATURE_FLAGS"
88- emconfigure ./configure --disable-shared --prefix=$GITHUB_WORKSPACE/dist
88+ emconfigure ./configure --disable-threadsafe --disable- shared --prefix=$GITHUB_WORKSPACE/dist
8989 # build amalgamation
9090 emmake make sqlite3.c
9191 emmake make install -j$(nproc)
@@ -208,11 +208,11 @@ jobs:
208208 git apply ../../patches/gdal_reduce_size.patch
209209 mkdir -p build && cd build
210210 emcmake cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/dist \
211- -DCMAKE_CXX_FLAGS="-s SUPPORT_LONGJMP=wasm" -DCMAKE_C_FLAGS="-s SUPPORT_LONGJMP=wasm" \
211+ -DCMAKE_CXX_FLAGS="-s SUPPORT_LONGJMP=wasm" -DCMAKE_C_FLAGS="-s SUPPORT_LONGJMP=wasm -s ERROR_ON_UNDEFINED_SYMBOLS=0 " \
212212 -DPROJ_INCLUDE_DIR=$GITHUB_WORKSPACE/dist/include -DPROJ_LIBRARY=$GITHUB_WORKSPACE/dist/lib/libproj.a \
213213 -DSQLite3_INCLUDE_DIR=$GITHUB_WORKSPACE/dist/include -DSQLite3_LIBRARY=$GITHUB_WORKSPACE/dist/lib/libsqlite3.a \
214214 -DPNG_LIBRARY=$EM_CACHE/sysroot/lib/wasm32-emscripten/libpng-wasm-sjlj.a \
215- -DGDAL_USE_ICONV=OFF -DGDAL_USE_INTERNAL_LIBS=OFF -DENABLE_GNM=OFF -DENABLE_PAM=OFF -DACCEPT_MISSING_SQLITE3_MUTEX_ALLOC=ON \
215+ -DGDAL_USE_ICONV=OFF -DGDAL_USE_INTERNAL_LIBS=OFF -DENABLE_GNM=OFF -DENABLE_PAM=OFF \
216216 -DGDAL_USE_JSONC_INTERNAL=ON -DBUILD_APPS=OFF -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/dist -DBUILD_TESTING=OFF ..
217217
218218 - name : Start compilation
Original file line number Diff line number Diff line change @@ -111,7 +111,7 @@ docker run -it --rm -v $(pwd):/src -v /etc/passwd:/etc/passwd --user "$(id -u):$
111111```
112112And execute in a second terminal the following command to install the missing build depedencies as root user.
113113``` sh
114- docker exec --user root mapserver-wasm bash -c " apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y tcl automake pkgconf libtool brotli"
114+ docker exec --user root mapserver-wasm bash -c " apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y brotli"
115115```
116116After that execute all job script commands described in ` .github/workflows/ci.yml ` inside the interactive build container. It can be helpful to set the ` GITHUB_WORKSPACE ` environment variable beforehand.
117117``` sh
Original file line number Diff line number Diff line change @@ -2,18 +2,6 @@ diff --git a/main.mk b/main.mk
22index a0b08e5773..acdb284684 100644
33--- a/main.mk
44+++ b/main.mk
5- @@ -1994,9 +1994,9 @@ xbin: threadtest5
6- # runtime performance hit, which is fine for use in the shell but is
7- # not appropriate for the canonical library build.
8- #
9- - sqlite3$(T.exe): shell.c sqlite3.c
10- + sqlite3$(T.exe): sqlite3.c
11- $(T.link) -o $@ \
12- - shell.c sqlite3.c \
13- + sqlite3.c \
14- $(CFLAGS.readline) $(SHELL_OPT) $(CFLAGS.icu) \
15- $(LDFLAGS.libsqlite3) $(LDFLAGS.readline)
16- #
175@@ -2019,7 +2019,7 @@ sqlite3d$(T.exe): shell.c $(LIBOBJS0)
186 install-shell-0: sqlite3$(T.exe) $(install-dir.bin)
197 $(INSTALL) -s sqlite3$(T.exe) "$(install-dir.bin)"
You can’t perform that action at this time.
0 commit comments