Skip to content

Commit

Permalink
Attempt to fix ssl issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kasper Peeters committed Dec 21, 2024
1 parent f5f0a48 commit 932eeaf
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/appimage.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
apt upgrade -y
cmake --version
# Install the rest.
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
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
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
# Build appimagetool, linuxdeploy and linuxdeploy-plugin-appimage, as we
# cannot run the linuxdeploy.AppImage inside QEMU.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fedora-40-package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
fedora:40 \
bash -c "
git config --global --add safe.directory /workspace
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
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
pip3 install sympy
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fedora-41-package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
fedora:40 \
bash -c "
git config --global --add safe.directory /workspace
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
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
pip3 install sympy
mkdir build
cd build
Expand Down
6 changes: 4 additions & 2 deletions client_server/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ find_package(SQLITE3 REQUIRED)
# can figure out what's wrong without a hard error here.
find_package(Threads)

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

# OpenSSL needs to be linked in explicitly (probably because the boost
# material referring to it is all in headers?).
Expand Down
10 changes: 5 additions & 5 deletions cmake/packaging.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ if(EXISTS "/etc/redhat-release")
set(CPACK_SYSTEM_NAME "fedora35")
elseif(LINUX_ISSUE MATCHES "40")
message("-- This is a Fedora 40 system")
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")
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")
set(CPACK_SYSTEM_NAME "fedora40")
elseif(LINUX_ISSUE MATCHES "41")
message("-- This is a Fedora 41 system")
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")
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")
set(CPACK_SYSTEM_NAME "fedora41")
elseif(LINUX_ISSUE MATCHES "24")
message("-- This is a Fedora 24 system")
Expand Down Expand Up @@ -153,17 +153,17 @@ else()
endif()
if(LINUX_ISSUE MATCHES "20.04")
set(CPACK_SYSTEM_NAME "focal")
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")
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")
message("-- This is an Ubuntu 20.04 system")
endif()
if(LINUX_ISSUE MATCHES "22.04")
set(CPACK_SYSTEM_NAME "ubuntu-22.04-jammy")
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")
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")
message("-- This is an Ubuntu 22.04 system")
endif()
if(LINUX_ISSUE MATCHES "24.04")
set(CPACK_SYSTEM_NAME "ubuntu-24.04-noble")
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")
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")
message("-- This is an Ubuntu 24.04 system")
endif()
endif()
Expand Down

0 comments on commit 932eeaf

Please sign in to comment.