From 4e47c6c0258f064996b7040502b52cbdf89b44ce Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Thu, 28 Aug 2025 23:23:35 +0200
Subject: [PATCH] Tweak Linux amalgamation (#3767)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .github/scripts/install-linux-deps |  3 ++-
 platform/linux/linux.cmake         | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/install-linux-deps b/.github/scripts/install-linux-deps
index 08b6af638..070f40531 100755
--- a/.github/scripts/install-linux-deps
+++ b/.github/scripts/install-linux-deps
@@ -10,5 +10,6 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
   libwebp-dev \
   libopengl0 \
   mesa-vulkan-drivers \
-  llvm
+  llvm \
+  glslang-dev
 cargo install armerge@2.2.0
diff --git a/platform/linux/linux.cmake b/platform/linux/linux.cmake
index 5abc3f619..397e07935 100644
--- a/platform/linux/linux.cmake
+++ b/platform/linux/linux.cmake
@@ -191,25 +191,38 @@ if(NOT MLN_USE_BUILTIN_ICU AND NOT "${ARMERGE}" STREQUAL "ARMERGE-NOTFOUND")
     find_static_library(STATIC_LIBS NAMES z)
     find_static_library(STATIC_LIBS NAMES jpeg)
     find_static_library(STATIC_LIBS NAMES webp)
-    find_static_library(STATIC_LIBS NAMES curl)
     find_static_library(STATIC_LIBS NAMES uv uv_a)
     find_static_library(STATIC_LIBS NAMES ssl)
     find_static_library(STATIC_LIBS NAMES crypto)
+    find_static_library(STATIC_LIBS NAMES bz2 bzip2)
+
+    if(MLN_WITH_VULKAN)
+        find_static_library(STATIC_LIBS NAMES glslang)
+        find_static_library(STATIC_LIBS NAMES glslang-default-resource-limits)
+        find_static_library(STATIC_LIBS NAMES SPIRV)
+        find_static_library(STATIC_LIBS NAMES SPIRV-Tools)
+        find_static_library(STATIC_LIBS NAMES SPIRV-Tools-opt)
+        find_static_library(STATIC_LIBS NAMES MachineIndependent)
+        find_static_library(STATIC_LIBS NAMES GenericCodeGen)
+    endif()
 
     add_custom_command(
         TARGET mbgl-core
         POST_BUILD
-        COMMAND armerge --keep-symbols '.*' --output libmbgl-core-amalgam.a
+        COMMAND armerge --keep-symbols 'mbgl.*' --output libmbgl-core-amalgam.a
             $<TARGET_FILE:mbgl-core>
             $<TARGET_FILE:freetype>
             $<TARGET_FILE:mbgl-vendor-csscolorparser>
             $<TARGET_FILE:harfbuzz>
+            $<TARGET_FILE:mbgl-vendor-nunicode>
             $<TARGET_FILE:mbgl-vendor-sqlite>
+            $<TARGET_FILE:mbgl-vendor-parsedate>
             ${ICUUC_LIBRARY_DIRS}/libicuuc.a
             ${ICUUC_LIBRARY_DIRS}/libicudata.a
             ${ICUI18N_LIBRARY_DIRS}/libicui18n.a
             ${STATIC_LIBS}
     )
+
 endif()
 
 add_subdirectory(${PROJECT_SOURCE_DIR}/bin)