Skip to content

Commit 932eeaf

Browse files
author
Kasper Peeters
committed
Attempt to fix ssl issues.
1 parent f5f0a48 commit 932eeaf

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

‎.github/workflows/appimage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
apt upgrade -y
8787
cmake --version
8888
# Install the rest.
89-
DEBIAN_FRONTEND=noninteractive apt install -y git cmake python3-dev python3-pip g++ libpcre3 libpcre3-dev libgmp3-dev libgtkmm-3.0-dev libboost-all-dev libgmp-dev libsqlite3-dev uuid-dev libmpfr-dev libmpc-dev python3-gmpy2 && python3 --version && which python3 && python3 -m pip install --upgrade pip && python3 -m pip install wheel && python3 -m pip install sympy numpy
89+
DEBIAN_FRONTEND=noninteractive apt install -y git cmake python3-dev python3-pip g++ libpcre3 libpcre3-dev libgmp3-dev libgtkmm-3.0-dev libssl-dev libboost-all-dev libgmp-dev libsqlite3-dev uuid-dev libmpfr-dev libmpc-dev python3-gmpy2 && python3 --version && which python3 && python3 -m pip install --upgrade pip && python3 -m pip install wheel && python3 -m pip install sympy numpy
9090
DEBIAN_FRONTEND=noninteractive apt install -y cimg-dev libgtest-dev ca-certificates libgpgme-dev libssh-gcrypt-dev libcurl4-gnutls-dev patchelf squashfs-tools desktop-file-utils
9191
# Build appimagetool, linuxdeploy and linuxdeploy-plugin-appimage, as we
9292
# cannot run the linuxdeploy.AppImage inside QEMU.

‎.github/workflows/fedora-40-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fedora:40 \
4646
bash -c "
4747
git config --global --add safe.directory /workspace
48-
dnf install -y rpm-build make gcc-c++ git python3-devel cmake gmp-devel libuuid-devel sqlite-devel gtkmm30-devel boost-devel python3-matplotlib python3-pip
48+
dnf install -y rpm-build make gcc-c++ git python3-devel cmake gmp-devel libuuid-devel sqlite-devel openssl-devel gtkmm30-devel boost-devel python3-matplotlib python3-pip
4949
pip3 install sympy
5050
mkdir build
5151
cd build

‎.github/workflows/fedora-41-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fedora:40 \
4646
bash -c "
4747
git config --global --add safe.directory /workspace
48-
dnf install -y rpm-build make gcc-c++ git python3-devel cmake gmp-devel libuuid-devel sqlite-devel gtkmm30-devel boost-devel python3-matplotlib python3-pip
48+
dnf install -y rpm-build make gcc-c++ git python3-devel cmake gmp-devel libuuid-devel sqlite-devel openssl-devel gtkmm30-devel boost-devel python3-matplotlib python3-pip
4949
pip3 install sympy
5050
mkdir build
5151
cd build

‎client_server/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ find_package(SQLITE3 REQUIRED)
2727
# can figure out what's wrong without a hard error here.
2828
find_package(Threads)
2929

30-
# We need at least Boost 1.75.0 because we now use `beast` (for the
30+
# We need at least Boost 1.71.0 because we now use `beast` (for the
3131
# websocket functionality) which was not stable before that version.
32-
find_package(Boost 1.75.0 COMPONENTS system program_options date_time filesystem REQUIRED)
32+
# Actually, it is probably not stable before 1.75.0, but if we go that
33+
# high we cannot build on Ubuntu 20.04 anymore.
34+
find_package(Boost 1.71.0 COMPONENTS system program_options date_time filesystem REQUIRED)
3335

3436
# OpenSSL needs to be linked in explicitly (probably because the boost
3537
# material referring to it is all in headers?).

‎cmake/packaging.cmake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ if(EXISTS "/etc/redhat-release")
5454
set(CPACK_SYSTEM_NAME "fedora35")
5555
elseif(LINUX_ISSUE MATCHES "40")
5656
message("-- This is a Fedora 40 system")
57-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy")
57+
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, openssl, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy")
5858
set(CPACK_SYSTEM_NAME "fedora40")
5959
elseif(LINUX_ISSUE MATCHES "41")
6060
message("-- This is a Fedora 41 system")
61-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy")
61+
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, openssl, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy")
6262
set(CPACK_SYSTEM_NAME "fedora41")
6363
elseif(LINUX_ISSUE MATCHES "24")
6464
message("-- This is a Fedora 24 system")
@@ -153,17 +153,17 @@ else()
153153
endif()
154154
if(LINUX_ISSUE MATCHES "20.04")
155155
set(CPACK_SYSTEM_NAME "focal")
156-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.71.0, libboost-filesystem1.71.0, libboost-program-options1.71.0, libboost-regex1.71.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
156+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libssl3, libboost-system1.71.0, libboost-filesystem1.71.0, libboost-program-options1.71.0, libboost-regex1.71.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
157157
message("-- This is an Ubuntu 20.04 system")
158158
endif()
159159
if(LINUX_ISSUE MATCHES "22.04")
160160
set(CPACK_SYSTEM_NAME "ubuntu-22.04-jammy")
161-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.74.0, libboost-filesystem1.74.0, libboost-program-options1.74.0, libboost-regex1.74.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, python3-matplotlib, python3-mpmath, python3-sympy, python3-gmpy2")
161+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libssl3, libboost-system1.74.0, libboost-filesystem1.74.0, libboost-program-options1.74.0, libboost-regex1.74.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, python3-matplotlib, python3-mpmath, python3-sympy, python3-gmpy2")
162162
message("-- This is an Ubuntu 22.04 system")
163163
endif()
164164
if(LINUX_ISSUE MATCHES "24.04")
165165
set(CPACK_SYSTEM_NAME "ubuntu-24.04-noble")
166-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1t64, python3-matplotlib, python3-mpmath, python3-sympy, python3-gmpy2")
166+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libssl3t64, libboost-system1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1t64, python3-matplotlib, python3-mpmath, python3-sympy, python3-gmpy2")
167167
message("-- This is an Ubuntu 24.04 system")
168168
endif()
169169
endif()

0 commit comments

Comments
 (0)