commit: d5102957a0d785d75302acd08aaf1570dc959179 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Apr 22 07:52:11 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Apr 23 08:58:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5102957
dev-libs/boost: remove unused patch Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11778 Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-libs/boost/files/boost-1.67.0-fix-python.patch | 153 --------------------- 1 file changed, 153 deletions(-) diff --git a/dev-libs/boost/files/boost-1.67.0-fix-python.patch b/dev-libs/boost/files/boost-1.67.0-fix-python.patch deleted file mode 100644 index 6f51152d12e..00000000000 --- a/dev-libs/boost/files/boost-1.67.0-fix-python.patch +++ /dev/null @@ -1,153 +0,0 @@ -Python module needs to be built without these extra renames. -MPI module needs to reference correct python - -~Index: boost_1_64_0/libs/mpi/build/Jamfile.v2 -~=================================================================== -~--- boost_1_64_0.orig/libs/mpi/build/Jamfile.v2 -~+++ boost_1_64_0/libs/mpi/build/Jamfile.v2 -~@@ -61,10 +61,10 @@ libraries += boost_mpi ; -~ lib boost_mpi_python -~ : # Sources -~ python/serialize.cpp -~+ /user-config//boost_python_alias -~ : # Requirements -~ <library>boost_mpi -~ <library>/mpi//mpi [ mpi.extra-requirements ] -~- <library>/boost/python//boost_python -~ <link>shared:<define>BOOST_MPI_DYN_LINK=1 -~ <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1 -~ <link>shared:<define>BOOST_PYTHON_DYN_LINK=1 -~@@ -92,8 +92,8 @@ libraries += boost_mpi ; -~ python/skeleton_and_content.cpp -~ python/status.cpp -~ python/py_timer.cpp -~+ /user-config//boost_python_alias -~ : # Requirements -~- <library>/boost/python//boost_python -~ <library>boost_mpi_python -~ <library>boost_mpi -~ <library>/mpi//mpi [ mpi.extra-requirements ] -Index: boost_1_67_0/libs/mpi/build/Jamfile.v2 -=================================================================== ---- boost_1_67_0.orig/libs/mpi/build/Jamfile.v2 -+++ boost_1_67_0/libs/mpi/build/Jamfile.v2 -@@ -60,33 +60,13 @@ libraries += boost_mpi ; - - if [ python.configured ] - { -- py2-version = [ py-version 2 ] ; -- py3-version = [ py-version 3 ] ; -- -- # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile. -- lib_boost_python(2) = boost_python ; -- lib_boost_python(3) = boost_python3 ; -- -- lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ; -- lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ; -- -- lib_boost_mpi_python(2) = boost_mpi_python ; -- lib_boost_mpi_python(3) = boost_mpi_python3 ; -- -- lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ; -- lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ; -- -- for local N in 2 3 -- { -- if $(py$(N)-version) -- { -- lib $(lib_boost_mpi_python($(py$(N)-version))) -+ lib boost_mpi_python - : # Sources - python/serialize.cpp - : # Requirements - <library>boost_mpi - <library>/mpi//mpi [ mpi.extra-requirements ] -- <library>/boost/python//$(lib_boost_python($(py$(N)-version))) -+ <library>/boost/python//boost_python - <link>shared:<define>BOOST_MPI_DYN_LINK=1 - <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1 - <link>shared:<define>BOOST_PYTHON_DYN_LINK=1 -@@ -94,12 +74,12 @@ libraries += boost_mpi ; - -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag - <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag - <python-debugging>on:<define>BOOST_DEBUG_PYTHON -- <python>$(py$(N)-version) - : # Default build - <link>shared - : # Usage requirements - <library>/mpi//mpi [ mpi.extra-requirements ] - ; -+ libraries += boost_mpi_python ; - - python-extension mpi - : # Sources -@@ -116,8 +96,8 @@ libraries += boost_mpi ; - python/status.cpp - python/py_timer.cpp - : # Requirements -- <library>/boost/python//$(lib_boost_python($(py$(N)-version))) -- <library>$(lib_boost_mpi_python($(py$(N)-version))) -+ <library>/boost/python//boost_python -+ <library>boost_mpi_python - <library>boost_mpi - <library>/mpi//mpi [ mpi.extra-requirements ] - <link>shared:<define>BOOST_MPI_DYN_LINK=1 -@@ -125,16 +105,7 @@ libraries += boost_mpi ; - <link>shared:<define>BOOST_PYTHON_DYN_LINK=1 - <link>shared <runtime-link>shared - <python-debugging>on:<define>BOOST_DEBUG_PYTHON -- <python>$(py$(N)-version) - ; -- -- libraries += $(lib_boost_mpi_python($(py$(N)-version))) ; -- } -- else -- { -- alias $(lib_boost_mpi_python($(N))) ; -- } -- } - } - } - else if ! ( --without-mpi in [ modules.peek : ARGV ] ) -Index: boost_1_67_0/libs/python/Jamfile -=================================================================== ---- boost_1_67_0.orig/libs/python/Jamfile -+++ boost_1_67_0/libs/python/Jamfile -@@ -36,9 +36,10 @@ local rule split-version ( version ) - # For example, Boost.Python built for Python 2.7 uses the suffix "27" - rule version-suffix ( version ) - { -- local major-minor = [ split-version $(version) ] ; -- local suffix = $(major-minor:J="") ; -- return $(suffix) ; -+ # local major-minor = [ split-version $(version) ] ; -+ # local suffix = $(major-minor:J="") ; -+ # return $(suffix) ; -+ return "" ; - } - - -diff -ur boost_1_67_0.orig/boostcpp.jam boost_1_67_0/boostcpp.jam ---- boost_1_67_0.orig/boostcpp.jam 2018-07-30 16:26:03.346187542 -0700 -+++ boost_1_67_0/boostcpp.jam 2018-07-30 16:26:18.839081472 -0700 -@@ -105,7 +105,7 @@ - python-id = [ option.get "python-buildid" ] ; - if $(python-id) - { -- PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ; -+ PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ; - } - - -diff -ur boost_1_67_0.orig/libs/python/Jamfile boost_1_67_0/libs/python/Jamfile ---- boost_1_67_0.orig/libs/python/Jamfile 2018-07-30 14:56:15.591366992 -0700 -+++ boost_1_67_0/libs/python/Jamfile 2018-07-30 16:26:31.662993677 -0700 -@@ -47,7 +47,7 @@ - python-id = [ option.get "python-buildid" ] ; - if $(python-id) - { -- PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ; -+ PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ; - } - - rule python-tag ( name : type ? : property-set )
