diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/boost/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/boost/files')
5 files changed, 494 insertions, 0 deletions
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch new file mode 100644 index 000000000000..23a87830d109 --- /dev/null +++ b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch @@ -0,0 +1,29 @@ +--- a/libs/locale/build/Jamfile.v2 ++++ b/libs/locale/build/Jamfile.v2 +@@ -58,8 +58,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 + { +@@ -117,7 +117,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 ; + + +@@ -176,7 +175,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.55.0-context-x32.patch b/dev-libs/boost/files/boost-1.55.0-context-x32.patch new file mode 100644 index 000000000000..5bf740625381 --- /dev/null +++ b/dev-libs/boost/files/boost-1.55.0-context-x32.patch @@ -0,0 +1,42 @@ +https://svn.boost.org/trac/boost/ticket/9445 + +hack to fix x32 builds + +--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S ++++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S +@@ -31,6 +31,10 @@ + * * + * *****************************************************************/ + ++#ifdef __x86_64__ ++#include "jump_x86_64_sysv_elf_gas.S" ++#else ++ + .text + .globl jump_fcontext + .align 2 +@@ -73,3 +77,5 @@ jump_fcontext: + + /* Mark that we don't need executable stack. */ + .section .note.GNU-stack,"",%progbits ++ ++#endif +--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S ++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S +@@ -31,6 +31,10 @@ + * * + * *****************************************************************/ + ++#ifdef __x86_64__ ++#include "make_x86_64_sysv_elf_gas.S" ++#else ++ + .text + .globl make_fcontext + .align 2 +@@ -78,3 +82,5 @@ finish: + + /* Mark that we don't need executable stack. */ + .section .note.GNU-stack,"",%progbits ++ ++#endif diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch new file mode 100644 index 000000000000..48ca51388713 --- /dev/null +++ b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch @@ -0,0 +1,13 @@ +Build auto_index tool with USE="tools" +Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066 + +--- a/tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300 ++++ b/tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300 +@@ -20,6 +20,7 @@ + use-project /boost/regression : regression/build ; + + TOOLS = ++ auto_index/build//auto_index + bcp//bcp + inspect/build//inspect + quickbook//quickbook 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 new file mode 100644 index 000000000000..18ca2f566711 --- /dev/null +++ b/dev-libs/boost/files/boost-1.63.0-fix-python.patch @@ -0,0 +1,138 @@ +--- 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 @@ + ; + } + +-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 + ; +@@ -53,10 +37,16 @@ + 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 ] ] ; ++ local python2 ; ++ if $(python_major_version) = 2 ++ { ++ python2 = true ; ++ } + +- lib [ cond $(is-py3) : boost_python3 : boost_python ] ++ lib boost_python + : # sources + numeric.cpp + list.cpp +@@ -90,20 +80,9 @@ + : # 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. +- # +- # 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 +@@ -112,7 +91,6 @@ + <dependency>config-warning + + <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- [ cond $(is-py3) : <python>$(py3-version) ] + + -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag + <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag +@@ -125,51 +103,8 @@ + ; + } + +-rule lib_boost_numpy ( is-py3 ? ) +-{ +- numpy-include = [ python.numpy-include ] ; +- lib [ cond $(is-py3) : boost_numpy3 : boost_numpy ] +- : # sources +- numpy/dtype.cpp +- numpy/matrix.cpp +- numpy/ndarray.cpp +- numpy/numpy.cpp +- numpy/scalars.cpp +- numpy/ufunc.cpp +- : # requirements +- [ cond [ python.numpy ] : <library>/python//python_for_extensions ] +- [ unless [ python.numpy ] : <build>no ] +- <include>$(numpy-include) +- <library>boost_python +- <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- [ cond $(is-py3) : <python>$(py3-version) ] +- +- -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag +- <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag +- +- : # default build +- <link>shared +- : # usage requirements +- <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- ; +-} +- + libraries = boost_python ; +-libraries3 = boost_python3 ; +-if [ python.numpy ] +-{ +- libraries += boost_numpy ; +- libraries3 += boost_numpy3 ; +-} + + lib_boost_python ; +-lib_boost_numpy ; +- +-if $(py3-version) +-{ +- lib_boost_python yes ; +- lib_boost_numpy yes ; +- libraries += $(libraries3) ; +-} + + boost-install $(libraries) ; 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 new file mode 100644 index 000000000000..079160218ea2 --- /dev/null +++ b/dev-libs/boost/files/boost-1.65.0-fix-python.patch @@ -0,0 +1,272 @@ +--- 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/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 @@ + ; + } + +-py2-version = [ py-version 2 ] ; +-py3-version = [ py-version 3 ] ; +- + project boost/python + : source-location ../src + ; + + rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } + rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } +-local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } } +- +-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)) ; + +-rule lib_boost_python ( version ) ++rule lib_boost_python + { +- lib $(lib_boost_python($(version))) ++ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ; ++ local python2 ; ++ if $(python_major_version) = 2 ++ { ++ python2 = true ; ++ } ++ ++ lib boost_python + : # sources + list.cpp + long.cpp +@@ -96,7 +93,8 @@ + # 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 $(python2) : <cxxflags>-fno-strict-aliasing ] ++ [ 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 +@@ -105,13 +103,10 @@ + <dependency>config-warning + + <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- <python>$(version) + + -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag + <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag + +- <conditional>@python.require-py +- + : # default build + <link>shared + : # usage requirements +@@ -120,68 +115,8 @@ + ; + } + +-lib_boost_numpy(2) = boost_numpy ; +-lib_boost_numpy(3) = boost_numpy3 ; +- +-lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ; +-lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ; +- +-rule lib_boost_numpy ( version ) +-{ +- numpy-include = [ python.numpy-include ] ; +- lib $(lib_boost_numpy($(version))) +- : # sources +- numpy/dtype.cpp +- numpy/matrix.cpp +- numpy/ndarray.cpp +- numpy/numpy.cpp +- numpy/scalars.cpp +- numpy/ufunc.cpp +- : # requirements +- <link>static:<define>BOOST_NUMPY_STATIC_LIB +- <define>BOOST_NUMPY_SOURCE +- [ cond [ python.numpy ] : <library>/python//python_for_extensions ] +- [ unless [ python.numpy ] : <build>no ] +- <include>$(numpy-include) +- <library>$(lib_boost_python($(version))) +- <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- <python>$(version) ++libraries = boost_python ; + +- -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag +- <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag +- +- <conditional>@python.require-py +- +- : # default build +- <link>shared +- : # usage requirements +- <link>static:<define>BOOST_NUMPY_STATIC_LIB +- <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- ; +-} +- +-libraries = ; +- +-for local N in 2 3 +-{ +- if $(py$(N)-version) +- { +- lib_boost_python $(py$(N)-version) ; +- libraries += $(lib_boost_python($(py$(N)-version))) ; +- } +- else +- { +- alias $(lib_boost_python($(N))) ; +- } +- if $(py$(N)-version) && [ python.numpy ] +- { +- lib_boost_numpy $(py$(N)-version) ; +- libraries += $(lib_boost_numpy($(py$(N)-version))) ; +- } +- else +- { +- alias $(lib_boost_numpy($(N))) ; +- } +-} ++lib_boost_python ; + + boost-install $(libraries) ; |