Skip to content

Commit eecb727

Browse files
authored
Statically link libsoidum Linux_x86_64.yml (#6938)
1 parent 7812d0a commit eecb727

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/Linux_x86.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ jobs:
4949
env:
5050
CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}}
5151
# We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
52+
# We set DEVILUTIONX_SYSTEM_LIBSODIUM=OFF because its soversion changes frequently.
5253
# We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions,
5354
# and there is no libsimpleini-dev:i386 for Ubuntu 20.04.
5455
run: |
5556
cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/linux_i386.toolchain.cmake \
5657
-DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
57-
-DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
58+
-DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF \
59+
-DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
5860
cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
5961
6062
- name: Package

.github/workflows/Linux_x86_64.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ jobs:
4545
env:
4646
CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}}
4747
# We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
48+
# We set DEVILUTIONX_SYSTEM_LIBSODIUM=OFF because its soversion changes frequently.
4849
# We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions.
4950
run: |
5051
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
51-
-DDISCORD_INTEGRATION=ON -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
52+
-DDISCORD_INTEGRATION=ON -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF \
53+
-DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
5254
cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
5355
5456
- name: Package

0 commit comments

Comments
 (0)