diff options
Diffstat (limited to 'dev-libs/boost/files')
-rw-r--r-- | dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch | 69 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch | 22 |
2 files changed, 0 insertions, 91 deletions
diff --git a/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch deleted file mode 100644 index 51003db29791..000000000000 --- a/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/6286 - ---- boostcpp.jam -+++ boostcpp.jam -@@ -99,13 +99,6 @@ - BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" "_" ] ; - } - --# Python build id (only for Python libraries) --python-id = [ option.get "python-buildid" ] ; --if $(python-id) --{ -- PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ; --} -- - ############################################################################## - # - # 1. The 'tag' function that adds decoration suitable to the properties if ---- libs/mpi/build/Jamfile.v2 -+++ 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 (only for Python libraries) -+python-id = [ option.get "python-buildid" ] ; -+if $(python-id) -+{ -+ PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ; -+} -+ - rule tag ( name : type ? : property-set ) - { - local result = $(name) ; ---- libs/python/build/Jamfile.v2 -+++ 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 (only for Python libraries) -+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.48.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch deleted file mode 100644 index af65f64992d2..000000000000 --- a/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libs/mpi/build/Jamfile.v2 -+++ 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 ) ---- libs/python/build/Jamfile.v2 -+++ 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) "[*\\/:\"\']" "_" ] ; - } - - |