1 |
commit: ac430ce23c8b18ae8e4b70b97f7df0b5dd3d5e74 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 27 16:45:24 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 16:47:03 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ac430ce2 |
7 |
|
8 |
dev-libs/boost: restore patches |
9 |
|
10 |
Closes: https://github.com/gentoo/sci/issues/1059 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../files/boost-1.71.0-build-auto_index-tool.patch | 13 ++++++++ |
14 |
.../boost/files/boost-1.71.0-context-x32.patch | 38 ++++++++++++++++++++++ |
15 |
.../files/boost-1.71.0-disable_icu_rpath.patch | 29 +++++++++++++++++ |
16 |
3 files changed, 80 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 000000000..ca793b9d0 |
21 |
--- /dev/null |
22 |
+++ b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch |
23 |
@@ -0,0 +1,13 @@ |
24 |
+Build auto_index tool with USE="tools" |
25 |
+See also: https://bugs.gentoo.org/529066 |
26 |
+ |
27 |
+--- a/tools/Jamfile.v2 |
28 |
++++ b/tools/Jamfile.v2 |
29 |
+@@ -18,6 +18,7 @@ |
30 |
+ ; |
31 |
+ |
32 |
+ TOOLS = |
33 |
++ auto_index/build//auto_index |
34 |
+ bcp//bcp |
35 |
+ inspect/build//inspect |
36 |
+ quickbook//quickbook |
37 |
|
38 |
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 |
39 |
new file mode 100644 |
40 |
index 000000000..9ee3d545d |
41 |
--- /dev/null |
42 |
+++ b/dev-libs/boost/files/boost-1.71.0-context-x32.patch |
43 |
@@ -0,0 +1,38 @@ |
44 |
+--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S |
45 |
++++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S |
46 |
+@@ -24,6 +24,10 @@ |
47 |
+ * * |
48 |
+ ****************************************************************************************/ |
49 |
+ |
50 |
++#ifdef __x86_64__ |
51 |
++#include "jump_x86_64_sysv_elf_gas.S" |
52 |
++#else |
53 |
++ |
54 |
+ .file "jump_i386_sysv_elf_gas.S" |
55 |
+ .text |
56 |
+ .globl jump_fcontext |
57 |
+@@ -81,3 +85,5 @@ |
58 |
+ |
59 |
+ /* Mark that we don't need executable stack. */ |
60 |
+ .section .note.GNU-stack,"",%progbits |
61 |
++ |
62 |
++#endif |
63 |
+--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S |
64 |
++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S |
65 |
+@@ -24,6 +24,10 @@ |
66 |
+ * * |
67 |
+ ****************************************************************************************/ |
68 |
+ |
69 |
++#ifdef __x86_64__ |
70 |
++#include "make_x86_64_sysv_elf_gas.S" |
71 |
++#else |
72 |
++ |
73 |
+ .file "make_i386_sysv_elf_gas.S" |
74 |
+ .text |
75 |
+ .globl make_fcontext |
76 |
+@@ -105,3 +109,5 @@ |
77 |
+ |
78 |
+ /* Mark that we don't need executable stack. */ |
79 |
+ .section .note.GNU-stack,"",%progbits |
80 |
++ |
81 |
++#endif |
82 |
|
83 |
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 |
84 |
new file mode 100644 |
85 |
index 000000000..32faf8d0e |
86 |
--- /dev/null |
87 |
+++ b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch |
88 |
@@ -0,0 +1,29 @@ |
89 |
+--- a/libs/locale/build/Jamfile.v2 |
90 |
++++ b/libs/locale/build/Jamfile.v2 |
91 |
+@@ -65,8 +65,8 @@ |
92 |
+ |
93 |
+ if $(ICU_LINK) |
94 |
+ { |
95 |
+- ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ; |
96 |
+- ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ; |
97 |
++ ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; |
98 |
++ ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; |
99 |
+ } |
100 |
+ else |
101 |
+ { |
102 |
+@@ -124,7 +124,6 @@ |
103 |
+ <library>icuuc/<link>shared/<runtime-link>shared |
104 |
+ <library>icudt/<link>shared/<runtime-link>shared |
105 |
+ <library>icuin/<link>shared/<runtime-link>shared |
106 |
+- <dll-path>$(ICU_PATH)/bin |
107 |
+ <runtime-link>shared ; |
108 |
+ |
109 |
+ |
110 |
+@@ -183,7 +182,6 @@ |
111 |
+ <library>icuuc_64/<link>shared/<runtime-link>shared |
112 |
+ <library>icudt_64/<link>shared/<runtime-link>shared |
113 |
+ <library>icuin_64/<link>shared/<runtime-link>shared |
114 |
+- <dll-path>$(ICU_PATH)/bin64 |
115 |
+ <runtime-link>shared ; |
116 |
+ |
117 |
+ |