From 739c65c54cb0e957df5e9b76f93fb02554e5cac3 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 4 May 2022 23:52:30 +0100 Subject: moved everything to new file formatting --- .../0001-revert-cease-dependence-on-range.patch | 1 - extra/boost/boost-1.57.0-python-abi_letters.patch | 62 ---------------------- .../boost/boost-1.57.0-python-libpython_dep.patch | 13 ----- extra/boost/python-3.10.patch | 49 ----------------- 4 files changed, 125 deletions(-) delete mode 100644 extra/boost/0001-revert-cease-dependence-on-range.patch delete mode 100644 extra/boost/boost-1.57.0-python-abi_letters.patch delete mode 100644 extra/boost/boost-1.57.0-python-libpython_dep.patch delete mode 100644 extra/boost/python-3.10.patch (limited to 'extra/boost') diff --git a/extra/boost/0001-revert-cease-dependence-on-range.patch b/extra/boost/0001-revert-cease-dependence-on-range.patch deleted file mode 100644 index 77b8178..0000000 --- a/extra/boost/0001-revert-cease-dependence-on-range.patch +++ /dev/null @@ -1 +0,0 @@ -Too Many Requests \ No newline at end of file diff --git a/extra/boost/boost-1.57.0-python-abi_letters.patch b/extra/boost/boost-1.57.0-python-abi_letters.patch deleted file mode 100644 index 7df3ee7..0000000 --- a/extra/boost/boost-1.57.0-python-abi_letters.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 -+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 -@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti - # using python : 2.3 : /usr/local/bin/python ; - # - rule init ( version ? : cmd-or-prefix ? : includes * : libraries ? -- : condition * : extension-suffix ? ) -+ : condition * : extension-suffix ? : abi-letters ? ) - { - project.push-current $(.project) ; - -@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ? - } - } - -- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ; -+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ; - - project.pop-current ; - } -@@ -653,7 +653,7 @@ local rule system-library-dependencies ( - - # Declare a target to represent Python's library. - # --local rule declare-libpython-target ( version ? : requirements * ) -+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? ) - { - # Compute the representation of Python version in the name of Python's - # library file. -@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve - } - - # Declare it. -- lib python.lib : : python$(lib-version) $(requirements) ; -+ lib python.lib : : python$(lib-version)$(abi-letters) $(requirements) ; - } - - - # Implementation of init. - local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : -- condition * : extension-suffix ? ) -+ condition * : extension-suffix ? : abi-letters ? ) - { - local prefix ; - local exec-prefix ; -@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o - extension-suffix ?= _d ; - } - extension-suffix ?= "" ; -+ abi-letters ?= "" ; - - # Normalize and dissect any version number. - local major-minor ; -@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o - } - else - { -- declare-libpython-target $(version) : $(target-requirements) ; -+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ; - - # This is an evil hack. On, Windows, when Python is embedded, nothing - # seems to set up sys.path to include Python's standard library diff --git a/extra/boost/boost-1.57.0-python-libpython_dep.patch b/extra/boost/boost-1.57.0-python-libpython_dep.patch deleted file mode 100644 index 57bfc26..0000000 --- a/extra/boost/boost-1.57.0-python-libpython_dep.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: boost_1_57_0/tools/build/src/tools/python.jam -=================================================================== ---- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406) -+++ boost_1_57_0/tools/build/src/tools/python.jam (working copy) -@@ -994,7 +994,7 @@ - else - { - alias python_for_extensions -- : -+ : python - : $(target-requirements) - : - : $(usage-requirements) diff --git a/extra/boost/python-3.10.patch b/extra/boost/python-3.10.patch deleted file mode 100644 index 2e1d5e3..0000000 --- a/extra/boost/python-3.10.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e193f080c7d209516ac9b712fa0c50bb08026fa2 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 19 Oct 2021 12:24:31 +0000 -Subject: [PATCH] BoostConfig.cmake: allow searching for python310 - -* accept double digits in Python3_VERSION_MINOR - -* if someone is using e.g.: - find_package(Python3 REQUIRED) - find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) - - with python-3.10 then it currently fails with: - - -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0") - -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter - CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package): - Could not find a package configuration file provided by "boost_python310" - (requested version 1.77.0) with any of the following names: - - boost_python310Config.cmake - boost_python310-config.cmake - - Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or - set "boost_python310_DIR" to a directory containing one of the above files. - If "boost_python310" provides a separate development package or SDK, be - sure it has been installed. - Call Stack (most recent call first): - /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component) - /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package) - CMakeLists.txt:18 (find_package) - -Signed-off-by: Martin Jansa ---- - BoostConfig.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/BoostConfig.cmake b/BoostConfig.cmake -index fd17821..5dffa58 100644 ---- a/tools/boost_install/BoostConfig.cmake -+++ b/tools/boost_install/BoostConfig.cmake -@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet) - set(_BOOST_REQUIRED REQUIRED) - endif() - -- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") -+ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$") - - # handle pythonXY and numpyXY versioned components for compatibility - -- cgit v1.2.1