commit: 19367bd30d2b6d0e9b96b3b782456d2c6ba7b6e4 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Feb 1 17:09:36 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 1 17:41:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19367bd3
dev-libs/boost: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/7017 .../boost-1.48.0-disable_libboost_python3.patch | 62 ------------------- .../boost-1.48.0-no_strict_aliasing_python2.patch | 23 -------- .../boost/files/boost-1.48.0-python_linking.patch | 24 -------- .../boost-1.51.0-respect_python-buildid.patch | 69 ---------------------- ...ost-1.51.0-support_dots_in_python-buildid.patch | 22 ------- 5 files changed, 200 deletions(-) diff --git a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch deleted file mode 100644 index d4560400d7d..00000000000 --- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/libs/python/build/Jamfile.v2 -+++ b/libs/python/build/Jamfile.v2 -@@ -39,23 +39,6 @@ - PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ; - } - -- --rule find-py3-version --{ -- local versions = [ feature.values python ] ; -- local py3ver ; -- for local v in $(versions) -- { -- if $(v) >= 3.0 -- { -- py3ver = $(v) ; -- } -- } -- return $(py3ver) ; --} -- --py3-version = [ find-py3-version ] ; -- - project boost/python - : source-location ../src - : requirements -@@ -82,7 +65,7 @@ - rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } - rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } - --rule lib_boost_python ( is-py3 ? ) -+rule lib_boost_python - { - - local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; -@@ -91,7 +74,7 @@ - { - python2 = true ; - } -- lib [ cond $(is-py3) : boost_python3 : boost_python ] -+ lib boost_python - : # sources - numeric.cpp - list.cpp -@@ -148,7 +131,6 @@ - <dependency>config-warning - - <python-debugging>on:<define>BOOST_DEBUG_PYTHON -- [ cond $(is-py3) : <python>$(py3-version) ] - : # default build - <link>shared - : # usage requirements -@@ -160,9 +142,3 @@ - - lib_boost_python ; - boost-install boost_python ; -- --if $(py3-version) --{ -- lib_boost_python yes ; -- boost-install boost_python3 ; --} diff --git a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch deleted file mode 100644 index cb26792f99c..00000000000 --- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/libs/python/build/Jamfile.v2 -+++ b/libs/python/build/Jamfile.v2 -@@ -85,6 +85,12 @@ - rule lib_boost_python ( is-py3 ? ) - { - -+ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; -+ local python2 ; -+ if $(python_major_version) = 2 -+ { -+ python2 = true ; -+ } - lib [ cond $(is-py3) : boost_python3 : boost_python ] - : # sources - numeric.cpp -@@ -119,6 +125,7 @@ - : # requirements - <link>static:<define>BOOST_PYTHON_STATIC_LIB - <define>BOOST_PYTHON_SOURCE -+ [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] - - # On Windows, all code using Python has to link to the Python - # import library. diff --git a/dev-libs/boost/files/boost-1.48.0-python_linking.patch b/dev-libs/boost/files/boost-1.48.0-python_linking.patch deleted file mode 100644 index 330cbb11e88..00000000000 --- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/libs/python/build/Jamfile.v2 -+++ b/libs/python/build/Jamfile.v2 -@@ -109,20 +109,7 @@ - <link>static:<define>BOOST_PYTHON_STATIC_LIB - <define>BOOST_PYTHON_SOURCE - [ cond $(python2) : <cxxflags>-fno-strict-aliasing ] -- -- # On Windows, all code using Python has to link to the Python -- # import library. -- # -- # On *nix we never link libboost_python to libpython. When -- # extending Python, all Python symbols are provided by the -- # Python interpreter executable. When embedding Python, the -- # client executable is expected to explicitly link to -- # /python//python (the target representing libpython) itself. -- # -- # python_for_extensions is a target defined by Boost.Build to -- # provide the Python include paths, and on Windows, the Python -- # import library, as usage requirements. -- [ cond [ python.configured ] : <library>/python//python_for_extensions ] -+ [ cond [ python.configured ] : <library>/python//python ] - - # we prevent building when there is no python available - # as it's not possible anyway, and to cause dependents to diff --git a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch deleted file mode 100644 index 17a681611b6..00000000000 --- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/6286 - ---- a/boostcpp.jam -+++ b/boostcpp.jam -@@ -99,13 +99,6 @@ - BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ; - } - --# Python build id (for Python libraries only). --python-id = [ option.get "python-buildid" ] ; --if $(python-id) --{ -- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; --} -- - - ################################################################################ - # ---- a/libs/mpi/build/Jamfile.v2 -+++ b/libs/mpi/build/Jamfile.v2 -@@ -8,6 +8,8 @@ - # Authors: Douglas Gregor - # Andrew Lumsdaine - -+import option ; -+import regex ; - import mpi ; - import indirect ; - import python ; -@@ -24,6 +26,13 @@ - <tag>@$(__name__).tag - ; - -+# Python build id (for Python libraries only). -+python-id = [ option.get "python-buildid" ] ; -+if $(python-id) -+{ -+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; -+} -+ - rule tag ( name : type ? : property-set ) - { - local result = $(name) ; ---- a/libs/python/build/Jamfile.v2 -+++ b/libs/python/build/Jamfile.v2 -@@ -2,6 +2,8 @@ - # Software License, Version 1.0. (See accompanying - # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -+import option ; -+import regex ; - import os ; - import indirect ; - import modules ; -@@ -30,6 +32,14 @@ - ; - } - -+# Python build id (for Python libraries only). -+python-id = [ option.get "python-buildid" ] ; -+if $(python-id) -+{ -+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; -+} -+ -+ - rule find-py3-version - { - local versions = [ feature.values python ] ; diff --git a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch deleted file mode 100644 index a8912eb5e04..00000000000 --- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libs/mpi/build/Jamfile.v2 -+++ b/libs/mpi/build/Jamfile.v2 -@@ -30,7 +30,7 @@ - python-id = [ option.get "python-buildid" ] ; - if $(python-id) - { -- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; -+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; - } - - rule tag ( name : type ? : property-set ) ---- a/libs/python/build/Jamfile.v2 -+++ b/libs/python/build/Jamfile.v2 -@@ -36,7 +36,7 @@ - python-id = [ option.get "python-buildid" ] ; - if $(python-id) - { -- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ; -+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ; - } - -
