Skip to content

Commit 7ea7124

Browse files
authored
Statically link BZIP2 on Linux releases to address issue with Fedora (#6939)
1 parent eecb727 commit 7ea7124

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/Linux_x86.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ jobs:
5151
# We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
5252
# We set DEVILUTIONX_SYSTEM_LIBSODIUM=OFF because its soversion changes frequently.
5353
# We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions,
54+
# We set DEVILUTIONX_SYSTEM_BZIP2=OFF because Fedora and Debian do not agree on how to link it.
5455
# and there is no libsimpleini-dev:i386 for Ubuntu 20.04.
5556
run: |
5657
cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/linux_i386.toolchain.cmake \
5758
-DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
5859
-DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF \
59-
-DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
60+
-DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF -DDEVILUTIONX_SYSTEM_BZIP2=OFF && \
6061
cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
6162
6263
- name: Package

.github/workflows/Linux_x86_64.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ jobs:
4747
# We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
4848
# We set DEVILUTIONX_SYSTEM_LIBSODIUM=OFF because its soversion changes frequently.
4949
# We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions.
50+
# We set DEVILUTIONX_SYSTEM_BZIP2=OFF because Fedora and Debian do not agree on how to link it.
5051
run: |
5152
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
5253
-DDISCORD_INTEGRATION=ON -DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF \
53-
-DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
54+
-DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF -DDEVILUTIONX_SYSTEM_BZIP2=OFF && \
5455
cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
5556
5657
- name: Package

0 commit comments

Comments
 (0)