Blame calamares-3.2.7-boost-python3.patch
|
Kevin Kofler |
970a5d2 |
diff -ur calamares-3.2.7/CMakeModules/BoostPython3.cmake calamares-3.2.7-boost-python3/CMakeModules/BoostPython3.cmake
|
|
Kevin Kofler |
970a5d2 |
--- calamares-3.2.7/CMakeModules/BoostPython3.cmake 2019-04-27 20:12:03.000000000 +0200
|
|
Kevin Kofler |
970a5d2 |
+++ calamares-3.2.7-boost-python3/CMakeModules/BoostPython3.cmake 2019-05-05 19:42:40.290272157 +0200
|
|
Kevin Kofler |
970a5d2 |
@@ -15,6 +15,11 @@
|
|
Kevin Kofler |
970a5d2 |
# libboost_python-3.4.so
|
|
Kevin Kofler |
970a5d2 |
# depending on what python's targets you selected during install
|
|
Kevin Kofler |
970a5d2 |
#
|
|
Kevin Kofler |
970a5d2 |
+# On Fedora >= 30 instead, the boost-python3-devel provides boost library with a
|
|
Kevin Kofler |
970a5d2 |
+# name like:
|
|
Kevin Kofler |
970a5d2 |
+# libboost_python37.so
|
|
Kevin Kofler |
970a5d2 |
+# depending on what python's targets you selected during install
|
|
Kevin Kofler |
970a5d2 |
+#
|
|
Kevin Kofler |
970a5d2 |
# find_boost_python3() tries to find the package with different component
|
|
Kevin Kofler |
970a5d2 |
# names. By default it tries "python3", "python-py$suffix" and
|
|
Kevin Kofler |
970a5d2 |
# "python-$dotsuffix", where suffix is based on the `python_version` argument.
|
|
Kevin Kofler |
970a5d2 |
@@ -47,6 +52,10 @@
|
|
Kevin Kofler |
970a5d2 |
_find_boost_python3_int( ${boost_version} python-py${_fbp_python_short_version} _fbp_found )
|
|
Kevin Kofler |
970a5d2 |
|
|
Kevin Kofler |
970a5d2 |
if (NOT _fbp_found)
|
|
Kevin Kofler |
970a5d2 |
+ _find_boost_python3_int( ${boost_version} python${_fbp_python_short_version} _fbp_found )
|
|
Kevin Kofler |
970a5d2 |
+ endif()
|
|
Kevin Kofler |
970a5d2 |
+
|
|
Kevin Kofler |
970a5d2 |
+ if (NOT _fbp_found)
|
|
Kevin Kofler |
970a5d2 |
# The following loop changes the searched name for Gentoo based distributions
|
|
Kevin Kofler |
970a5d2 |
# turns "3.4.123abc" into "3.4"
|
|
Kevin Kofler |
970a5d2 |
string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1.\\2" _fbp_python_short_version ${python_version} )
|