* [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/
@ 2016-12-29 16:37 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2016-12-29 16:37 UTC (permalink / raw
To: gentoo-commits
commit: 27150fd922e2f8fa91f4bd6029cc26b3abf7c948
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 16:36:39 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 16:36:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27150fd9
dev-libs/boost: Fix python libname
Gentoo-bug: 604036, 604046
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-libs/boost/files/boost-1.63.0-fix-python.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dev-libs/boost/files/boost-1.63.0-fix-python.patch b/dev-libs/boost/files/boost-1.63.0-fix-python.patch
index abfefb6..18ca2f5 100644
--- a/dev-libs/boost/files/boost-1.63.0-fix-python.patch
+++ b/dev-libs/boost/files/boost-1.63.0-fix-python.patch
@@ -1,3 +1,14 @@
+--- a/boostcpp.jam
++++ b/boostcpp.jam
+@@ -104,7 +104,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
++ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
+ }
+
+
--- a/libs/python/build/Jamfile
+++ b/libs/python/build/Jamfile
@@ -30,22 +30,6 @@
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/
@ 2017-09-06 22:23 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-09-06 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 1f4cdea811496e9740761a1718f50d1fd4dfdd96
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 6 22:22:23 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 6 22:22:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f4cdea8
dev-libs/boost: Fix python multi-impl MPI handling
Bug: https://bugs.gentoo.org/show_bug.cgi?id=629848
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-libs/boost/files/boost-1.65.0-fix-python.patch | 128 +++++++++++++++++++++
1 file changed, 128 insertions(+)
diff --git a/dev-libs/boost/files/boost-1.65.0-fix-python.patch b/dev-libs/boost/files/boost-1.65.0-fix-python.patch
index e960edb8703..079160218ea 100644
--- a/dev-libs/boost/files/boost-1.65.0-fix-python.patch
+++ b/dev-libs/boost/files/boost-1.65.0-fix-python.patch
@@ -9,6 +9,134 @@
}
+--- a/libs/mpi/build/Jamfile.v2
++++ b/libs/mpi/build/Jamfile.v2
+@@ -58,81 +58,50 @@
+
+ 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)))
+- : # Sources
+- python/serialize.cpp
+- : # Requirements
+- <library>boost_mpi
+- <library>/mpi//mpi [ mpi.extra-requirements ]
+- <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
+- <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
+- <define>BOOST_MPI_PYTHON_SOURCE=1
+- -<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 ]
+- ;
+-
+- python-extension mpi
+- : # Sources
+- python/collectives.cpp
+- python/py_communicator.cpp
+- python/datatypes.cpp
+- python/documentation.cpp
+- python/py_environment.cpp
+- python/py_nonblocking.cpp
+- python/py_exception.cpp
+- python/module.cpp
+- python/py_request.cpp
+- python/skeleton_and_content.cpp
+- 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_mpi
+- <library>/mpi//mpi [ mpi.extra-requirements ]
+- <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
+- <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))) ;
+- }
+- }
++ lib boost_mpi_python
++ : # Sources
++ python/serialize.cpp
++ : # 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
++ <define>BOOST_MPI_PYTHON_SOURCE=1
++ -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
++ <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
++ : # Default build
++ <link>shared
++ : # Usage requirements
++ <library>/mpi//mpi [ mpi.extra-requirements ]
++ ;
++ libraries += boost_mpi_python ;
++
++ python-extension mpi
++ : # Sources
++ python/collectives.cpp
++ python/py_communicator.cpp
++ python/datatypes.cpp
++ python/documentation.cpp
++ python/py_environment.cpp
++ python/py_nonblocking.cpp
++ python/py_exception.cpp
++ python/module.cpp
++ python/py_request.cpp
++ python/skeleton_and_content.cpp
++ python/status.cpp
++ python/py_timer.cpp
++ : # Requirements
++ <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
++ <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
++ <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
++ <link>shared <runtime-link>shared
++ ;
+ }
+ }
+ else if ! ( --without-mpi in [ modules.peek : ARGV ] )
--- a/libs/python/build/Jamfile
+++ b/libs/python/build/Jamfile
@@ -31,26 +31,23 @@
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/
@ 2018-02-01 17:41 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-02-01 17:41 UTC (permalink / raw
To: gentoo-commits
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) [*\\/:\"\'] _ ] ;
- }
-
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/
@ 2019-04-23 8:58 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2019-04-23 8:58 UTC (permalink / raw
To: gentoo-commits
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 )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/
@ 2022-12-06 21:25 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2022-12-06 21:25 UTC (permalink / raw
To: gentoo-commits
commit: ad6496f10ac3e6101a9886d73997245f7ff0a69b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 6 21:25:28 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 21:25:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad6496f1
dev-libs/boost: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/28571
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../boost/files/boost-1.79.0-CVE-2012-2677.patch | 121 ---------------------
.../files/boost-1.79.0-disable_icu_rpath.patch | 29 -----
.../files/boost-1.79.0-fix-mips1-transition.patch | 39 -------
3 files changed, 189 deletions(-)
diff --git a/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch b/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch
deleted file mode 100644
index 5dfbf85bc63f..000000000000
--- a/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-https://src.fedoraproject.org/rpms/boost/raw/master/f/boost-1.58.0-pool.patch
-https://bugzilla.redhat.com/show_bug.cgi?id=828856
-https://bugs.gentoo.org/620468
-https://svn.boost.org/trac10/ticket/6701
-
---- a/boost/pool/pool.hpp
-+++ b/boost/pool/pool.hpp
-@@ -27,4 +27,6 @@
- #include <boost/pool/poolfwd.hpp>
-
-+// std::numeric_limits
-+#include <boost/limits.hpp>
- // boost::integer::static_lcm
- #include <boost/integer/common_factor_ct.hpp>
-@@ -356,4 +358,11 @@
- }
-
-+ size_type max_chunks() const
-+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
-+ size_type partition_size = alloc_size();
-+ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
-+ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
-+ }
-+
- static void * & nextof(void * const ptr)
- { //! \returns Pointer dereferenced.
-@@ -375,5 +384,7 @@
- //! the first time that object needs to allocate system memory.
- //! The default is 32. This parameter may not be 0.
-- //! \param nmax_size is the maximum number of chunks to allocate in one block.
-+ //! \param nmax_size is the maximum number of chunks to allocate in one block.
-+ set_next_size(nnext_size);
-+ set_max_size(nmax_size);
- }
-
-@@ -398,7 +409,7 @@
- }
- void set_next_size(const size_type nnext_size)
-- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
-- //! \returns nnext_size.
-- next_size = start_size = nnext_size;
-+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
-+ BOOST_USING_STD_MIN();
-+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
- }
- size_type get_max_size() const
-@@ -408,5 +419,6 @@
- void set_max_size(const size_type nmax_size)
- { //! Set max_size.
-- max_size = nmax_size;
-+ BOOST_USING_STD_MIN();
-+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
- }
- size_type get_requested_size() const
-@@ -709,7 +721,7 @@
- BOOST_USING_STD_MIN();
- if(!max_size)
-- next_size <<= 1;
-+ set_next_size(next_size << 1);
- else if( next_size*partition_size/requested_size < max_size)
-- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
-
- // initialize it,
-@@ -749,7 +761,7 @@
- BOOST_USING_STD_MIN();
- if(!max_size)
-- next_size <<= 1;
-+ set_next_size(next_size << 1);
- else if( next_size*partition_size/requested_size < max_size)
-- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
-
- // initialize it,
-@@ -793,4 +805,6 @@
- //! \returns Address of chunk n if allocated ok.
- //! \returns 0 if not enough memory for n chunks.
-+ if (n > max_chunks())
-+ return 0;
-
- const size_type partition_size = alloc_size();
-@@ -841,7 +855,7 @@
- BOOST_USING_STD_MIN();
- if(!max_size)
-- next_size <<= 1;
-+ set_next_size(next_size << 1);
- else if( next_size*partition_size/requested_size < max_size)
-- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
-
- // insert it into the list,
---- a/libs/pool/test/test_bug_6701.cpp
-+++ b/libs/pool/test/test_bug_6701.cpp
-@@ -0,0 +1,27 @@
-+/* Copyright (C) 2012 Étienne Dupuis
-+*
-+* Use, modification and distribution is subject to the
-+* Boost Software License, Version 1.0. (See accompanying
-+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
-+*/
-+
-+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
-+
-+#include <boost/pool/object_pool.hpp>
-+#include <boost/limits.hpp>
-+
-+int main()
-+{
-+ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
-+
-+ void *x = p.malloc();
-+ BOOST_ASSERT(!x);
-+
-+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
-+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
-+
-+ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
-+ BOOST_ASSERT(!y);
-+
-+ return 0;
-+}
diff --git a/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch
deleted file mode 100644
index 32faf8d0eb31..000000000000
--- a/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/libs/locale/build/Jamfile.v2
-+++ b/libs/locale/build/Jamfile.v2
-@@ -65,8 +65,8 @@
-
- if $(ICU_LINK)
- {
-- ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
-- ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
-+ ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
-+ ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
- }
- else
- {
-@@ -124,7 +124,6 @@
- <library>icuuc/<link>shared/<runtime-link>shared
- <library>icudt/<link>shared/<runtime-link>shared
- <library>icuin/<link>shared/<runtime-link>shared
-- <dll-path>$(ICU_PATH)/bin
- <runtime-link>shared ;
-
-
-@@ -183,7 +182,6 @@
- <library>icuuc_64/<link>shared/<runtime-link>shared
- <library>icudt_64/<link>shared/<runtime-link>shared
- <library>icuin_64/<link>shared/<runtime-link>shared
-- <dll-path>$(ICU_PATH)/bin64
- <runtime-link>shared ;
-
-
diff --git a/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch b/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch
deleted file mode 100644
index 81b29ac6cac1..000000000000
--- a/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/boostorg/boost/commit/791442bf1ed7a3b14893ed9e73ef2ab32b2a6026, and
-https://github.com/boostorg/config/commit/1a55d1d9c6d1cf7739645080bdd92fe903b4211e without the file renaming.
-
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -634,7 +634,7 @@ rule address-model ( )
- return <conditional>@boostcpp.deduce-address-model ;
- }
-
--local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ;
-+local deducable-architectures = arm mips power riscv s390x sparc x86 combined ;
- feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ;
- for a in $(deducable-architectures)
- {
-@@ -645,10 +645,10 @@ rule deduce-architecture ( properties * )
- {
- local result ;
- local filtered = [ toolset-properties $(properties) ] ;
-- local names = arm mips1 power riscv s390x sparc x86 combined ;
-+ local names = arm mips power riscv s390x sparc x86 combined ;
- local idx = [ configure.find-builds "default architecture" : $(filtered)
- : /boost/architecture//arm
-- : /boost/architecture//mips1
-+ : /boost/architecture//mips
- : /boost/architecture//power
- : /boost/architecture//riscv
- : /boost/architecture//s390x
---- a/libs/config/checks/architecture/Jamfile.jam
-+++ b/libs/config/checks/architecture/Jamfile.jam
-@@ -18,7 +18,8 @@ obj 64 : 64.cpp ;
-
- obj arm : arm.cpp ;
- obj combined : combined.cpp ;
--obj mips1 : mips1.cpp ;
-+obj mips : mips1.cpp ;
-+alias mips1 : mips ; # Backwards compatibility
- obj power : power.cpp ;
- obj riscv : riscv.cpp ;
- obj sparc : sparc.cpp ;
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-12-06 21:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-23 8:58 [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-12-06 21:25 David Seifert
2018-02-01 17:41 Andreas Sturmlechner
2017-09-06 22:23 David Seifert
2016-12-29 16:37 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox