Skip to content

Commit

Permalink
Another attempt to fix openssl issues on various platforms.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kasper Peeters committed Dec 21, 2024
1 parent 932eeaf commit 74e337b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/opensuse-tumbleweed-package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
zypper -n install --no-recommends rpmbuild git cmake python311-devel gcc-c++ \
gmp-devel libuuid-devel \
gtkmm3-devel sqlite3-devel \
python311-matplotlib \
python311-matplotlib openssl \
libboost_system-devel libboost_filesystem-devel \
libboost_date_time-devel libboost_program_options-devel
git config --global --add safe.directory /workspace
Expand Down
90 changes: 13 additions & 77 deletions cmake/packaging.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,50 +24,16 @@ if(EXISTS "/etc/redhat-release")
endif()
if(LINUX_ISSUE MATCHES "Fedora")
set(CPACK_GENERATOR "RPM")
if(LINUX_ISSUE MATCHES "26")
message("-- This is a Fedora 26 system")
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora26")
elseif(LINUX_ISSUE MATCHES "27")
message("-- This is a Fedora 27 system")
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora27")
elseif(LINUX_ISSUE MATCHES "28")
message("-- This is a Fedora 28 system")
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora28")
elseif(LINUX_ISSUE MATCHES "29")
message("-- This is a Fedora 29 system")
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora29")
elseif(LINUX_ISSUE MATCHES "32")
message("-- This is a Fedora 32 system")
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora32")
elseif(LINUX_ISSUE MATCHES "33")
message("-- This is a Fedora 33 system")
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora33")
elseif(LINUX_ISSUE MATCHES "35")
message("-- This is a Fedora 35 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, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora35")
elseif(LINUX_ISSUE MATCHES "40")
if(LINUX_ISSUE MATCHES "40")
message("-- This is a Fedora 40 system")
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, 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")
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora24")
else()
message("-- This is a Fedora <24 system")
set(CPACK_RPM_PACKAGE_REQUIRES "python-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python-matplotlib, dvipng, texlive, texlive-ytableau")
set(CPACK_SYSTEM_NAME "fedora")
message(FATAL_ERROR "-- This is an old Fedora system <40, we do not support packaging for this anymore")
endif()
endif()
else()
Expand All @@ -76,14 +42,14 @@ else()
if(LINUX_ISSUE MATCHES "15.0")
set(CPACK_SYSTEM_NAME "leap150")
set(CPACK_GENERATOR "RPM")
message("-- This is an openSUSE Leap 15.0 system")
message("-- This is an openSUSE Leap 15.0 system (UNSUPPORTED)")
set(CPACK_RPM_PACKAGE_REQUIRES "libpython3_6m1_0, libgmp10, libuuid1, libsqlite3-0, libgtkmm-3_0-1, libboost_system1_66_0, libboost_filesystem1_66_0, libboost_program_options1_66_0, libboost_regex1_66_0, libstdc++6, python3-matplotlib, python3-sympy")
endif()
if(LINUX_ISSUE MATCHES "Tumbleweed")
set(CPACK_SYSTEM_NAME "tumbleweed")
set(CPACK_GENERATOR "RPM")
message("-- This is an openSUSE Tumbleweed system")
set(CPACK_RPM_PACKAGE_REQUIRES "libpython3_11-1_0, libgmp10, libuuid1, libgtkmm-3_0-1, libboost_system1_85_0, libboost_filesystem1_85_0, libboost_program_options1_85_0, libboost_regex1_85_0, libstdc++6, python311-matplotlib, python311-sympy")
set(CPACK_RPM_PACKAGE_REQUIRES "libpython3_11-1_0, libgmp10, libuuid1, libgtkmm-3_0-1, openssl, libboost_system1_85_0, libboost_filesystem1_85_0, libboost_program_options1_85_0, libboost_regex1_85_0, libstdc++6, python311-matplotlib, python311-sympy")
endif()
endif()
if(EXISTS "/etc/issue")
Expand All @@ -92,7 +58,7 @@ else()
if(LINUX_ISSUE MATCHES "42.1")
set(CPACK_SYSTEM_NAME "leap421")
set(CPACK_GENERATOR "RPM")
message("-- This is an openSUSE Leap 42.1 system")
message("-- This is an openSUSE Leap 42.1 system (UNSUPPORTED)")
set(CPACK_RPM_PACKAGE_REQUIRES "libpython3_4m1_0, libgmp10, libuuid1, libsqlite3-0, libgtkmm-3_0-1, libboost_system1_61_0, libboost_filesystem1_61_0, libboost_program_options1_61_0, libboost_regex1_61_0, libstdc++6, python3-matplotlib, texlive-dvipng, texlive, texlive-ytableau")
endif()
endif()
Expand Down Expand Up @@ -131,26 +97,6 @@ else()
set(PYTHON_SITE_PATH "/usr/lib/python3/dist-packages")
set(INSTALL_LATEX_DIR "/usr/share/texmf")
endif()
if(LINUX_ISSUE MATCHES "14.04")
set(CPACK_SYSTEM_NAME "trusty")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.54.0, libboost-filesystem1.54.0, libboost-program-options1.54.0, libboost-regex1.54.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python-sympy")
message("-- This is an Ubuntu 14.04 system")
endif()
if(LINUX_ISSUE MATCHES "16.04")
set(CPACK_SYSTEM_NAME "xenial")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.58.0, libboost-filesystem1.58.0, libboost-program-options1.58.0, libboost-regex1.58.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
message("-- This is an Ubuntu 16.04 system")
endif()
if(LINUX_ISSUE MATCHES "17.10")
set(CPACK_SYSTEM_NAME "artful")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.62.0, libboost-filesystem1.62.0, libboost-program-options1.62.0, libboost-regex1.62.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
message("-- This is an Ubuntu 17.10 system")
endif()
if(LINUX_ISSUE MATCHES "18.04")
set(CPACK_SYSTEM_NAME "bionic")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.65.1, libboost-filesystem1.65.1, libboost-program-options1.65.1, libboost-regex1.65.1, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
message("-- This is an Ubuntu 18.04 system")
endif()
if(LINUX_ISSUE MATCHES "20.04")
set(CPACK_SYSTEM_NAME "focal")
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")
Expand All @@ -174,30 +120,20 @@ else()
set(PYTHON_SITE_PATH "/usr/lib/python3/dist-packages")
set(INSTALL_LATEX_DIR "/usr/share/texmf")
endif()
if(LINUX_ISSUE MATCHES "21")
message("-- This is a Linux Mint 21 system")
set(CPACK_SYSTEM_NAME "vanessa")
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, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
endif()
if(LINUX_ISSUE MATCHES "20")
message("-- This is a Linux Mint 20 system")
set(CPACK_SYSTEM_NAME "ulyana")
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")
endif()
if(LINUX_ISSUE MATCHES "19")
message("-- This is a Linux Mint 19 system")
set(CPACK_SYSTEM_NAME "tessa")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.65.1, libboost-filesystem1.65.1, libboost-program-options1.65.1, libboost-regex1.65.1, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
endif()
if(LINUX_ISSUE MATCHES "18")
message("-- This is a Linux Mint 18 system")
set(CPACK_SYSTEM_NAME "sarah")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.58.0, libboost-filesystem1.58.0, libboost-program-options1.58.0, libboost-regex1.58.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
if(LINUX_ISSUE MATCHES "20")
message("-- This is a Linux Mint 20 system")
set(CPACK_SYSTEM_NAME "ulyana")
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")
endif()
if(LINUX_ISSUE MATCHES "17")
set(CPACK_SYSTEM_NAME "qiana")
message("-- This is a Linux Mint 17 system")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.54.0, libboost-filesystem1.54.0, libboost-program-options1.54.0, libboost-regex1.54.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy")
if(LINUX_ISSUE MATCHES "21")
message("-- This is a Linux Mint 21 system")
set(CPACK_SYSTEM_NAME "vanessa")
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, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
endif()
endif()
endif()
Expand Down
2 changes: 1 addition & 1 deletion frontend/gtkmm/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ find_package(Threads)
find_package(SQLITE3)
find_package(GLIBMM)
find_package(GTKMM3)
find_package(Boost 1.75.0 COMPONENTS system REQUIRED)
find_package(Boost 1.71.0 COMPONENTS system REQUIRED)
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
Expand Down

0 comments on commit 74e337b

Please sign in to comment.