diff options
author | David Seifert <soap@gentoo.org> | 2019-04-15 01:40:42 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2019-04-15 01:40:42 +0200 |
commit | 0c52eca5a522be8bf5c43d2f4da043553dbf36ce (patch) | |
tree | 96dc41ba91cd196791da81ceb3ace97cdd27a780 /dev-libs/boost/files | |
parent | sys-apps/texinfo: arm64 stable (bug #679174) (diff) | |
download | gentoo-0c52eca5a522be8bf5c43d2f4da043553dbf36ce.tar.gz gentoo-0c52eca5a522be8bf5c43d2f4da043553dbf36ce.tar.bz2 gentoo-0c52eca5a522be8bf5c43d2f4da043553dbf36ce.zip |
dev-libs/boost: Version bump to 1.70.0
* bzip2/lzma/zlib/zstd support can now be
disabled via USE flags explicitly.
* Upstream has fixed Boost.Python to finally
support building against multiple Python 3
implementations concurrently:
https://github.com/boostorg/python/commit/d4d41d94aecc
Going forward, Gentoo will stop modifying
the upstream build system for its multiple
implementations. This will lead to some
short-term pain, as the library pattern changes
from
libboost_python-3.6.so
to
libboost_python36.so
which is the canonical name used by upstream.
Changing this name should be avoided, as the
filename is also encoded as a macro in various
boost headers.
Bug: https://bugs.gentoo.org/631590
Closes: https://bugs.gentoo.org/653878
Closes: https://github.com/gentoo/gentoo/pull/11659
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-libs/boost/files')
-rw-r--r-- | dev-libs/boost/files/boost-1.69.0-context-x32.patch | 38 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch | 33 |
2 files changed, 71 insertions, 0 deletions
diff --git a/dev-libs/boost/files/boost-1.69.0-context-x32.patch b/dev-libs/boost/files/boost-1.69.0-context-x32.patch new file mode 100644 index 000000000000..9ee3d545d618 --- /dev/null +++ b/dev-libs/boost/files/boost-1.69.0-context-x32.patch @@ -0,0 +1,38 @@ +--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S ++++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S +@@ -24,6 +24,10 @@ + * * + ****************************************************************************************/ + ++#ifdef __x86_64__ ++#include "jump_x86_64_sysv_elf_gas.S" ++#else ++ + .file "jump_i386_sysv_elf_gas.S" + .text + .globl jump_fcontext +@@ -81,3 +85,5 @@ + + /* 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 +@@ -24,6 +24,10 @@ + * * + ****************************************************************************************/ + ++#ifdef __x86_64__ ++#include "make_x86_64_sysv_elf_gas.S" ++#else ++ + .file "make_i386_sysv_elf_gas.S" + .text + .globl make_fcontext +@@ -105,3 +109,5 @@ + + /* Mark that we don't need executable stack. */ + .section .note.GNU-stack,"",%progbits ++ ++#endif diff --git a/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch b/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch new file mode 100644 index 000000000000..c0097a8581bd --- /dev/null +++ b/dev-libs/boost/files/boost-1.70.0-fix-python-cmake-duplicate-target.patch @@ -0,0 +1,33 @@ +Boost.Build errors out when passing multiple python impls to b2: + + error: Name clash for '<p/var/tmp/portage/dev-libs/boost-1.70.0/image/usr/lib64/cmake/boost_python-1.70.0>libboost_python-variant-shared.cmake' + error: + error: Tried to build the target twice, with property sets having + error: these incompatible properties: + error: + error: - <python>2.7 + error: - <python>3.6 + error: + error: Please make sure to have consistent requirements for these + error: properties everywhere in your project, especially for install + error: targets. + +https://github.com/boostorg/python/issues/262 + +--- a/tools/boost_install/boost-install.jam ++++ b/tools/boost_install/boost-install.jam +@@ -870,12 +870,12 @@ + + $(p).mark-target-as-explicit install-libraries ; + +- install-cmake-config $(libraries) ; ++ # install-cmake-config $(libraries) ; + + generate install-dependencies : $(libraries) : <generating-rule>@boost-install%generate-dependencies <name>install ; + $(p).mark-target-as-explicit install-dependencies ; + +- alias install : install-libraries install-cmake-config install-dependencies ; ++ alias install : install-libraries install-dependencies ; + $(p).mark-target-as-explicit install ; + + # Target stage |