Statically link libsoidum Linux_x86_64.yml (#6938)

diasurgical · Feb 5, 2024 · eecb727 · eecb727
1 parent 7812d0a
commit eecb727
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml
@@ -49,12 +49,14 @@ jobs:
       env:
         CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}}
       # We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
+      # We set DEVILUTIONX_SYSTEM_LIBSODIUM=OFF because its soversion changes frequently.
       # We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions,
       # and there is no libsimpleini-dev:i386 for Ubuntu 20.04.
       run: |
         cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/linux_i386.toolchain.cmake \
           -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
-          -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
+          -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF \
+          -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
         cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
 
     - name: Package

diff --git a/.github/workflows/Linux_x86_64.yml b/.github/workflows/Linux_x86_64.yml
@@ -45,10 +45,12 @@ jobs:
       env:
         CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}}
       # We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
+      # We set DEVILUTIONX_SYSTEM_LIBSODIUM=OFF because its soversion changes frequently.
       # We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions.
       run: |
         cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
-          -DDISCORD_INTEGRATION=ON -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
+          -DDISCORD_INTEGRATION=ON -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF \
+          -DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
         cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
 
     - name: Package