commit: ac430ce23c8b18ae8e4b70b97f7df0b5dd3d5e74 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 27 16:45:24 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 27 16:47:03 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ac430ce2
dev-libs/boost: restore patches Closes: https://github.com/gentoo/sci/issues/1059 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/boost-1.71.0-build-auto_index-tool.patch | 13 ++++++++ .../boost/files/boost-1.71.0-context-x32.patch | 38 ++++++++++++++++++++++ .../files/boost-1.71.0-disable_icu_rpath.patch | 29 +++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch new file mode 100644 index 000000000..ca793b9d0 --- /dev/null +++ b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch @@ -0,0 +1,13 @@ +Build auto_index tool with USE="tools" +See also: https://bugs.gentoo.org/529066 + +--- a/tools/Jamfile.v2 ++++ b/tools/Jamfile.v2 +@@ -18,6 +18,7 @@ + ; + + TOOLS = ++ auto_index/build//auto_index + bcp//bcp + inspect/build//inspect + quickbook//quickbook diff --git a/dev-libs/boost/files/boost-1.71.0-context-x32.patch b/dev-libs/boost/files/boost-1.71.0-context-x32.patch new file mode 100644 index 000000000..9ee3d545d --- /dev/null +++ b/dev-libs/boost/files/boost-1.71.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.71.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch new file mode 100644 index 000000000..32faf8d0e --- /dev/null +++ b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch @@ -0,0 +1,29 @@ +--- 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 ; + +
