fix(Dockerfile, Makefile, manifest): Address user/group ID mapping and attempt to resolve ninja errors

This commit is contained in:
2025-05-07 03:04:41 +08:00
parent 78c3eed0fc
commit 1b4744024b
3 changed files with 84 additions and 59 deletions

View File

@@ -218,23 +218,24 @@ modules:
- -DSKIA_DIR=/app
- -DSKIA_LIBRARY_DIR=/app/lib
- -DSKIA_LIBRARY=/app/lib/libskia.a
# Use Skia's bundled libraries instead of system libraries
- -DUSE_SHARED_LIBJPEG=OFF
- -DUSE_SHARED_LIBPNG=ON
- -DUSE_SHARED_ZLIB=ON
- -DUSE_SHARED_GIFLIB=ON
- -DUSE_SHARED_WEBP=OFF
- -DUSE_SHARED_FREETYPE=OFF
- -DUSE_SHARED_HARFBUZZ=OFF
# Set library locations explicitly
- -DWEBP_INCLUDE_DIR=/app/third_party/externals/libwebp/src
- -DWEBP_LIBRARIES=/app/lib/libwebp.a
- -DLIBJPEG_TURBO_INCLUDE_DIR=/app/third_party/externals/libjpeg-turbo
- -DLIBJPEG_TURBO_LIBRARY=/app/lib/libjpeg.a
- -DFREETYPE_INCLUDE_DIR=/app/third_party/externals/freetype/include
- -DFREETYPE_LIBRARY=/app/lib/libfreetype.a
- -DHARFBUZZ_INCLUDE_DIR=/app/third_party/externals/harfbuzz/src
- -DHARFBUZZ_LIBRARY=/app/lib/libharfbuzz.a
# Use Skia's bundled libraries (static) or SDK-provided shared libraries
- -DUSE_SHARED_JPEG=OFF # Bundled static with Skia
- -DUSE_SHARED_LIBPNG=ON # Provided by SDK (shared)
- -DUSE_SHARED_ZLIB=ON # Provided by SDK (shared)
- -DUSE_SHARED_GIFLIB=ON # Provided by SDK (shared)
- -DUSE_SHARED_WEBP=OFF # Bundled static with Skia
- -DUSE_SHARED_FREETYPE=OFF # Bundled static with Skia
- -DUSE_SHARED_HARFBUZZ=OFF # Bundled static with Skia
# Set library locations explicitly for bundled static libs
# CMake standard variable names (often plural for DIRS/LIBRARIES)
- -DWebP_INCLUDE_DIRS=/app/third_party/externals/libwebp/src
- -DWebP_LIBRARIES=/app/lib/libwebp.a
- -DJPEG_INCLUDE_DIRS=/app/third_party/externals/libjpeg-turbo
- -DJPEG_LIBRARIES=/app/lib/libjpeg.a
- -DFreetype_INCLUDE_DIRS=/app/third_party/externals/freetype/include
- -DFreetype_LIBRARIES=/app/lib/libfreetype.a
- -DHarfBuzz_INCLUDE_DIRS=/app/third_party/externals/harfbuzz/src
- -DHarfBuzz_LIBRARIES=/app/lib/libharfbuzz.a
build-commands:
# Standard ninja build
- ninja