| 1 |
commit: 11d093e4ec16f42e733d605dccf3100d4bb435ba |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 22 13:43:14 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 22 15:11:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d093e4 |
| 7 |
|
| 8 |
sys-devel/llvm: Group all patches by newest version applicable |
| 9 |
|
| 10 |
.../fix_LLVMExports_cmake.patch} | 0 |
| 11 |
.../clang/gentoo-install.patch} | 0 |
| 12 |
.../gcc-5.1.patch} | 0 |
| 13 |
.../gentoo-install.patch} | 0 |
| 14 |
.../clang/fbsd-gcc49.patch} | 0 |
| 15 |
.../gcc-4.9.patch} | 0 |
| 16 |
.../gentoo-install.patch} | 0 |
| 17 |
.../nodoctargz.patch} | 0 |
| 18 |
.../ocaml-ctypes-0.4.0.patch} | 0 |
| 19 |
...lang-runtime-into-usr-lib-without-suffix.patch} | 0 |
| 20 |
.../clang/ccc-analyzer-isystem.patch} | 0 |
| 21 |
.../clang/gentoo-install.patch} | 0 |
| 22 |
.../compiler-rt/arm_march_flags.patch} | 0 |
| 23 |
.../compiler-rt/msan-fix.patch} | 0 |
| 24 |
.../lldb/python.patch} | 0 |
| 25 |
.../lldb/tinfo.patch} | 0 |
| 26 |
.../llvm-config-0.patch} | 0 |
| 27 |
.../llvm-config-1.patch} | 0 |
| 28 |
.../llvm-config-2.patch} | 0 |
| 29 |
.../llvm-config-3.patch} | 0 |
| 30 |
.../msan-fix.patch} | 0 |
| 31 |
...lang-runtime-into-usr-lib-without-suffix.patch} | 0 |
| 32 |
...ake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch} | 0 |
| 33 |
.../clang/abi-tag-support-mangler.patch} | 0 |
| 34 |
.../clang/abi-tag-support-sema.patch} | 0 |
| 35 |
.../clang/darwin_prefix-include-paths.patch} | 0 |
| 36 |
.../clang/default-libs.patch} | 0 |
| 37 |
.../clang/gcc4.9-search-path.patch} | 0 |
| 38 |
.../clang/gentoo-runtime-gcc-detection-v3.patch} | 0 |
| 39 |
.../clang/musl-support.patch} | 0 |
| 40 |
...l-compiler-rt-into-usr-lib-without-suffi.patch} | 0 |
| 41 |
.../compiler-rt/arm_march_flags.patch} | 0 |
| 42 |
.../compiler-rt/fbsd.patch} | 0 |
| 43 |
.../lldb/six.patch} | 0 |
| 44 |
.../llvm-config-r1.patch} | 0 |
| 45 |
.../llvm-config.patch} | 0 |
| 46 |
.../musl-env-support.patch} | 0 |
| 47 |
...ll-OCaml-modules-into-correct-package-loc.patch | 71 ++++++++++++++++++++++ |
| 48 |
...e-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch | 28 +++++++++ |
| 49 |
...t-overriding-Sphinx-HTML-doc-install-dir.patch} | 13 ++-- |
| 50 |
...-ordering-dep-between-HTML-man-Sphinx-ta.patch} | 13 ++-- |
| 51 |
.../0005-cmake-Do-not-install-libgtest.patch} | 12 ++-- |
| 52 |
...ake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch | 28 +++++++++ |
| 53 |
...Clean-up-exported-values-update-for-shar.patch} | 37 ++++++++--- |
| 54 |
...e-Restore-SOVERSIONs-on-shared-libraries.patch} | 10 +-- |
| 55 |
.../musl-fixes.patch} | 0 |
| 56 |
.../files/cmake/llvm-3.7.0-ocaml-build_doc.patch | 12 ---- |
| 57 |
.../files/cmake/llvm-3.7.0-ocaml-multilib.patch | 43 ------------- |
| 58 |
.../llvm-3.8-allow_custom_cmake_build_types.patch | 14 ----- |
| 59 |
sys-devel/llvm/llvm-3.5.0.ebuild | 14 ++--- |
| 60 |
sys-devel/llvm/llvm-3.5.2.ebuild | 14 ++--- |
| 61 |
sys-devel/llvm/llvm-3.6.2.ebuild | 16 ++--- |
| 62 |
sys-devel/llvm/llvm-3.7.1-r3.ebuild | 44 +++++++------- |
| 63 |
sys-devel/llvm/llvm-3.8.0-r3.ebuild | 34 +++++------ |
| 64 |
sys-devel/llvm/llvm-3.8.1-r2.ebuild | 46 +++++++------- |
| 65 |
sys-devel/llvm/llvm-3.8.1.ebuild | 34 +++++------ |
| 66 |
sys-devel/llvm/llvm-9999.ebuild | 18 +++--- |
| 67 |
57 files changed, 292 insertions(+), 209 deletions(-) |
| 68 |
|
| 69 |
diff --git a/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch b/sys-devel/llvm/files/3.5.0/fix_LLVMExports_cmake.patch |
| 70 |
similarity index 100% |
| 71 |
rename from sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch |
| 72 |
rename to sys-devel/llvm/files/3.5.0/fix_LLVMExports_cmake.patch |
| 73 |
|
| 74 |
diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-install.patch b/sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch |
| 75 |
similarity index 100% |
| 76 |
rename from sys-devel/llvm/files/clang-3.5-gentoo-install.patch |
| 77 |
rename to sys-devel/llvm/files/3.5.2/clang/gentoo-install.patch |
| 78 |
|
| 79 |
diff --git a/sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch b/sys-devel/llvm/files/3.5.2/gcc-5.1.patch |
| 80 |
similarity index 100% |
| 81 |
rename from sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch |
| 82 |
rename to sys-devel/llvm/files/3.5.2/gcc-5.1.patch |
| 83 |
|
| 84 |
diff --git a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch b/sys-devel/llvm/files/3.5.2/gentoo-install.patch |
| 85 |
similarity index 100% |
| 86 |
rename from sys-devel/llvm/files/llvm-3.5-gentoo-install.patch |
| 87 |
rename to sys-devel/llvm/files/3.5.2/gentoo-install.patch |
| 88 |
|
| 89 |
diff --git a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch b/sys-devel/llvm/files/3.6.2/clang/fbsd-gcc49.patch |
| 90 |
similarity index 100% |
| 91 |
rename from sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch |
| 92 |
rename to sys-devel/llvm/files/3.6.2/clang/fbsd-gcc49.patch |
| 93 |
|
| 94 |
diff --git a/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch b/sys-devel/llvm/files/3.6.2/gcc-4.9.patch |
| 95 |
similarity index 100% |
| 96 |
rename from sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch |
| 97 |
rename to sys-devel/llvm/files/3.6.2/gcc-4.9.patch |
| 98 |
|
| 99 |
diff --git a/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch b/sys-devel/llvm/files/3.6.2/gentoo-install.patch |
| 100 |
similarity index 100% |
| 101 |
rename from sys-devel/llvm/files/llvm-3.6-gentoo-install.patch |
| 102 |
rename to sys-devel/llvm/files/3.6.2/gentoo-install.patch |
| 103 |
|
| 104 |
diff --git a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sys-devel/llvm/files/3.6.2/nodoctargz.patch |
| 105 |
similarity index 100% |
| 106 |
rename from sys-devel/llvm/files/llvm-3.2-nodoctargz.patch |
| 107 |
rename to sys-devel/llvm/files/3.6.2/nodoctargz.patch |
| 108 |
|
| 109 |
diff --git a/sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch b/sys-devel/llvm/files/3.6.2/ocaml-ctypes-0.4.0.patch |
| 110 |
similarity index 100% |
| 111 |
rename from sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch |
| 112 |
rename to sys-devel/llvm/files/3.6.2/ocaml-ctypes-0.4.0.patch |
| 113 |
|
| 114 |
diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 115 |
similarity index 100% |
| 116 |
rename from sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 117 |
rename to sys-devel/llvm/files/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 118 |
|
| 119 |
diff --git a/sys-devel/llvm/files/clang-3.7.1-ccc-analyzer-isystem.patch b/sys-devel/llvm/files/3.7.1/clang/ccc-analyzer-isystem.patch |
| 120 |
similarity index 100% |
| 121 |
rename from sys-devel/llvm/files/clang-3.7.1-ccc-analyzer-isystem.patch |
| 122 |
rename to sys-devel/llvm/files/3.7.1/clang/ccc-analyzer-isystem.patch |
| 123 |
|
| 124 |
diff --git a/sys-devel/llvm/files/clang-3.6-gentoo-install.patch b/sys-devel/llvm/files/3.7.1/clang/gentoo-install.patch |
| 125 |
similarity index 100% |
| 126 |
rename from sys-devel/llvm/files/clang-3.6-gentoo-install.patch |
| 127 |
rename to sys-devel/llvm/files/3.7.1/clang/gentoo-install.patch |
| 128 |
|
| 129 |
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/3.7.1/compiler-rt/arm_march_flags.patch |
| 130 |
similarity index 100% |
| 131 |
rename from sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch |
| 132 |
rename to sys-devel/llvm/files/3.7.1/compiler-rt/arm_march_flags.patch |
| 133 |
|
| 134 |
diff --git a/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch b/sys-devel/llvm/files/3.7.1/compiler-rt/msan-fix.patch |
| 135 |
similarity index 100% |
| 136 |
rename from sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch |
| 137 |
rename to sys-devel/llvm/files/3.7.1/compiler-rt/msan-fix.patch |
| 138 |
|
| 139 |
diff --git a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch b/sys-devel/llvm/files/3.7.1/lldb/python.patch |
| 140 |
similarity index 100% |
| 141 |
rename from sys-devel/llvm/files/llvm-3.7-lldb_python.patch |
| 142 |
rename to sys-devel/llvm/files/3.7.1/lldb/python.patch |
| 143 |
|
| 144 |
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch b/sys-devel/llvm/files/3.7.1/lldb/tinfo.patch |
| 145 |
similarity index 100% |
| 146 |
rename from sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch |
| 147 |
rename to sys-devel/llvm/files/3.7.1/lldb/tinfo.patch |
| 148 |
|
| 149 |
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch b/sys-devel/llvm/files/3.7.1/llvm-config-0.patch |
| 150 |
similarity index 100% |
| 151 |
rename from sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch |
| 152 |
rename to sys-devel/llvm/files/3.7.1/llvm-config-0.patch |
| 153 |
|
| 154 |
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch b/sys-devel/llvm/files/3.7.1/llvm-config-1.patch |
| 155 |
similarity index 100% |
| 156 |
rename from sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch |
| 157 |
rename to sys-devel/llvm/files/3.7.1/llvm-config-1.patch |
| 158 |
|
| 159 |
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch b/sys-devel/llvm/files/3.7.1/llvm-config-2.patch |
| 160 |
similarity index 100% |
| 161 |
rename from sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch |
| 162 |
rename to sys-devel/llvm/files/3.7.1/llvm-config-2.patch |
| 163 |
|
| 164 |
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch b/sys-devel/llvm/files/3.7.1/llvm-config-3.patch |
| 165 |
similarity index 100% |
| 166 |
rename from sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch |
| 167 |
rename to sys-devel/llvm/files/3.7.1/llvm-config-3.patch |
| 168 |
|
| 169 |
diff --git a/sys-devel/llvm/files/llvm-3.7-msan-fix.patch b/sys-devel/llvm/files/3.7.1/msan-fix.patch |
| 170 |
similarity index 100% |
| 171 |
rename from sys-devel/llvm/files/llvm-3.7-msan-fix.patch |
| 172 |
rename to sys-devel/llvm/files/3.7.1/msan-fix.patch |
| 173 |
|
| 174 |
diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch b/sys-devel/llvm/files/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 175 |
similarity index 100% |
| 176 |
rename from sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
| 177 |
rename to sys-devel/llvm/files/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 178 |
|
| 179 |
diff --git a/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 180 |
similarity index 100% |
| 181 |
rename from sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 182 |
rename to sys-devel/llvm/files/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 183 |
|
| 184 |
diff --git a/sys-devel/llvm/files/clang-3.8-abi-tag-support-mangler.patch b/sys-devel/llvm/files/3.8.1/clang/abi-tag-support-mangler.patch |
| 185 |
similarity index 100% |
| 186 |
rename from sys-devel/llvm/files/clang-3.8-abi-tag-support-mangler.patch |
| 187 |
rename to sys-devel/llvm/files/3.8.1/clang/abi-tag-support-mangler.patch |
| 188 |
|
| 189 |
diff --git a/sys-devel/llvm/files/clang-3.8-abi-tag-support-sema.patch b/sys-devel/llvm/files/3.8.1/clang/abi-tag-support-sema.patch |
| 190 |
similarity index 100% |
| 191 |
rename from sys-devel/llvm/files/clang-3.8-abi-tag-support-sema.patch |
| 192 |
rename to sys-devel/llvm/files/3.8.1/clang/abi-tag-support-sema.patch |
| 193 |
|
| 194 |
diff --git a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch b/sys-devel/llvm/files/3.8.1/clang/darwin_prefix-include-paths.patch |
| 195 |
similarity index 100% |
| 196 |
rename from sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch |
| 197 |
rename to sys-devel/llvm/files/3.8.1/clang/darwin_prefix-include-paths.patch |
| 198 |
|
| 199 |
diff --git a/sys-devel/llvm/files/clang-3.8-default-libs.patch b/sys-devel/llvm/files/3.8.1/clang/default-libs.patch |
| 200 |
similarity index 100% |
| 201 |
rename from sys-devel/llvm/files/clang-3.8-default-libs.patch |
| 202 |
rename to sys-devel/llvm/files/3.8.1/clang/default-libs.patch |
| 203 |
|
| 204 |
diff --git a/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch b/sys-devel/llvm/files/3.8.1/clang/gcc4.9-search-path.patch |
| 205 |
similarity index 100% |
| 206 |
rename from sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch |
| 207 |
rename to sys-devel/llvm/files/3.8.1/clang/gcc4.9-search-path.patch |
| 208 |
|
| 209 |
diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 210 |
similarity index 100% |
| 211 |
rename from sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 212 |
rename to sys-devel/llvm/files/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 213 |
|
| 214 |
diff --git a/sys-devel/llvm/files/clang-3.8-musl-support.patch b/sys-devel/llvm/files/3.8.1/clang/musl-support.patch |
| 215 |
similarity index 100% |
| 216 |
rename from sys-devel/llvm/files/clang-3.8-musl-support.patch |
| 217 |
rename to sys-devel/llvm/files/3.8.1/clang/musl-support.patch |
| 218 |
|
| 219 |
diff --git a/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 220 |
similarity index 100% |
| 221 |
rename from sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 222 |
rename to sys-devel/llvm/files/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 223 |
|
| 224 |
diff --git a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/3.8.1/compiler-rt/arm_march_flags.patch |
| 225 |
similarity index 100% |
| 226 |
rename from sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch |
| 227 |
rename to sys-devel/llvm/files/3.8.1/compiler-rt/arm_march_flags.patch |
| 228 |
|
| 229 |
diff --git a/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch b/sys-devel/llvm/files/3.8.1/compiler-rt/fbsd.patch |
| 230 |
similarity index 100% |
| 231 |
rename from sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch |
| 232 |
rename to sys-devel/llvm/files/3.8.1/compiler-rt/fbsd.patch |
| 233 |
|
| 234 |
diff --git a/sys-devel/llvm/files/llvm-3.8-lldb_six.patch b/sys-devel/llvm/files/3.8.1/lldb/six.patch |
| 235 |
similarity index 100% |
| 236 |
rename from sys-devel/llvm/files/llvm-3.8-lldb_six.patch |
| 237 |
rename to sys-devel/llvm/files/3.8.1/lldb/six.patch |
| 238 |
|
| 239 |
diff --git a/sys-devel/llvm/files/llvm-3.8-llvm-config-r1.patch b/sys-devel/llvm/files/3.8.1/llvm-config-r1.patch |
| 240 |
similarity index 100% |
| 241 |
rename from sys-devel/llvm/files/llvm-3.8-llvm-config-r1.patch |
| 242 |
rename to sys-devel/llvm/files/3.8.1/llvm-config-r1.patch |
| 243 |
|
| 244 |
diff --git a/sys-devel/llvm/files/llvm-3.8-llvm-config.patch b/sys-devel/llvm/files/3.8.1/llvm-config.patch |
| 245 |
similarity index 100% |
| 246 |
rename from sys-devel/llvm/files/llvm-3.8-llvm-config.patch |
| 247 |
rename to sys-devel/llvm/files/3.8.1/llvm-config.patch |
| 248 |
|
| 249 |
diff --git a/sys-devel/llvm/files/llvm-3.8-musl-support.patch b/sys-devel/llvm/files/3.8.1/musl-env-support.patch |
| 250 |
similarity index 100% |
| 251 |
rename from sys-devel/llvm/files/llvm-3.8-musl-support.patch |
| 252 |
rename to sys-devel/llvm/files/3.8.1/musl-env-support.patch |
| 253 |
|
| 254 |
diff --git a/sys-devel/llvm/files/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch b/sys-devel/llvm/files/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 255 |
new file mode 100644 |
| 256 |
index 0000000..367a8a77 |
| 257 |
--- /dev/null |
| 258 |
+++ b/sys-devel/llvm/files/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 259 |
@@ -0,0 +1,71 @@ |
| 260 |
+From 2907883b3c504a08b98cf735ceaa8e438d20f37e Mon Sep 17 00:00:00 2001 |
| 261 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 262 |
+Date: Sun, 21 Aug 2016 22:46:48 +0200 |
| 263 |
+Subject: [PATCH 01/10] cmake: Install OCaml modules into correct package |
| 264 |
+ location |
| 265 |
+ |
| 266 |
+Ensure that correct libdir is used for OCaml modules, and install them |
| 267 |
+into dedicated llvm subdirectory rather than the top directory which is |
| 268 |
+supposedly reserved for the standard library. |
| 269 |
+ |
| 270 |
+Author: Mark Wright <gienah@g.o> |
| 271 |
+Bug: https://bugs.gentoo.org/559134 |
| 272 |
+Bug: https://bugs.gentoo.org/559624 |
| 273 |
+--- |
| 274 |
+ bindings/ocaml/backends/CMakeLists.txt | 2 +- |
| 275 |
+ bindings/ocaml/llvm/CMakeLists.txt | 2 +- |
| 276 |
+ cmake/modules/AddOCaml.cmake | 6 +++--- |
| 277 |
+ 3 files changed, 5 insertions(+), 5 deletions(-) |
| 278 |
+ |
| 279 |
+diff --git a/bindings/ocaml/backends/CMakeLists.txt b/bindings/ocaml/backends/CMakeLists.txt |
| 280 |
+index a980638..9e5dc50 100644 |
| 281 |
+--- a/bindings/ocaml/backends/CMakeLists.txt |
| 282 |
++++ b/bindings/ocaml/backends/CMakeLists.txt |
| 283 |
+@@ -23,5 +23,5 @@ foreach(TARGET ${LLVM_TARGETS_TO_BUILD}) |
| 284 |
+ "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}") |
| 285 |
+ |
| 286 |
+ install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}" |
| 287 |
+- DESTINATION lib/ocaml) |
| 288 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) |
| 289 |
+ endforeach() |
| 290 |
+diff --git a/bindings/ocaml/llvm/CMakeLists.txt b/bindings/ocaml/llvm/CMakeLists.txt |
| 291 |
+index 4956fa4..c612f73 100644 |
| 292 |
+--- a/bindings/ocaml/llvm/CMakeLists.txt |
| 293 |
++++ b/bindings/ocaml/llvm/CMakeLists.txt |
| 294 |
+@@ -8,4 +8,4 @@ configure_file( |
| 295 |
+ "${LLVM_LIBRARY_DIR}/ocaml/META.llvm") |
| 296 |
+ |
| 297 |
+ install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm" |
| 298 |
+- DESTINATION lib/ocaml) |
| 299 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) |
| 300 |
+diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake |
| 301 |
+index e3dd1d8..a16238e 100644 |
| 302 |
+--- a/cmake/modules/AddOCaml.cmake |
| 303 |
++++ b/cmake/modules/AddOCaml.cmake |
| 304 |
+@@ -137,7 +137,7 @@ function(add_ocaml_library name) |
| 305 |
+ if( APPLE ) |
| 306 |
+ set(ocaml_rpath "@executable_path/../../lib") |
| 307 |
+ elseif( UNIX ) |
| 308 |
+- set(ocaml_rpath "\\$ORIGIN/../../lib") |
| 309 |
++ set(ocaml_rpath "\\$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}") |
| 310 |
+ endif() |
| 311 |
+ list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") |
| 312 |
+ |
| 313 |
+@@ -189,12 +189,12 @@ function(add_ocaml_library name) |
| 314 |
+ endforeach() |
| 315 |
+ |
| 316 |
+ install(FILES ${install_files} |
| 317 |
+- DESTINATION lib/ocaml) |
| 318 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) |
| 319 |
+ install(FILES ${install_shlibs} |
| 320 |
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE |
| 321 |
+ GROUP_READ GROUP_EXECUTE |
| 322 |
+ WORLD_READ WORLD_EXECUTE |
| 323 |
+- DESTINATION lib/ocaml) |
| 324 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) |
| 325 |
+ |
| 326 |
+ foreach( install_file ${install_files} ${install_shlibs} ) |
| 327 |
+ get_filename_component(filename "${install_file}" NAME) |
| 328 |
+-- |
| 329 |
+2.9.3 |
| 330 |
+ |
| 331 |
|
| 332 |
diff --git a/sys-devel/llvm/files/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch b/sys-devel/llvm/files/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 333 |
new file mode 100644 |
| 334 |
index 0000000..b90527a |
| 335 |
--- /dev/null |
| 336 |
+++ b/sys-devel/llvm/files/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 337 |
@@ -0,0 +1,28 @@ |
| 338 |
+From 726806d9b4932287d67f9b6b112099648ea008b4 Mon Sep 17 00:00:00 2001 |
| 339 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 340 |
+Date: Sun, 21 Aug 2016 23:01:47 +0200 |
| 341 |
+Subject: [PATCH 02/10] cmake: Make OCaml docs dependent on LLVM_BUILD_DOCS |
| 342 |
+ |
| 343 |
+Author: Bernard Cafarelli <voyageur@g.o> |
| 344 |
+Bug: https://bugs.gentoo.org/562008 |
| 345 |
+Patch: https://reviews.llvm.org/D23763 |
| 346 |
+--- |
| 347 |
+ docs/CMakeLists.txt | 2 +- |
| 348 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 349 |
+ |
| 350 |
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt |
| 351 |
+index eaa1750..f2cd7e9 100644 |
| 352 |
+--- a/docs/CMakeLists.txt |
| 353 |
++++ b/docs/CMakeLists.txt |
| 354 |
+@@ -115,7 +115,7 @@ if (LLVM_ENABLE_SPHINX) |
| 355 |
+ endif() |
| 356 |
+ |
| 357 |
+ list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml) |
| 358 |
+-if( NOT uses_ocaml LESS 0 ) |
| 359 |
++if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS ) |
| 360 |
+ set(doc_targets |
| 361 |
+ ocaml_llvm |
| 362 |
+ ocaml_llvm_all_backends |
| 363 |
+-- |
| 364 |
+2.9.3 |
| 365 |
+ |
| 366 |
|
| 367 |
diff --git a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 368 |
similarity index 78% |
| 369 |
rename from sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 370 |
rename to sys-devel/llvm/files/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 371 |
index 3e57f0d..76adf52 100644 |
| 372 |
--- a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 373 |
+++ b/sys-devel/llvm/files/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 374 |
@@ -1,19 +1,20 @@ |
| 375 |
-From 2ec240a76253839cd1c5dc2e964f55698ae468fc Mon Sep 17 00:00:00 2001 |
| 376 |
+From 1251ac2021b768d3a56b4dc03212ea2fd12a34dd Mon Sep 17 00:00:00 2001 |
| 377 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 378 |
Date: Mon, 8 Jun 2015 06:43:00 +0200 |
| 379 |
-Subject: [PATCH 2/4] cmake: Support overriding Sphinx HTML doc install |
| 380 |
+Subject: [PATCH 03/10] cmake: Support overriding Sphinx HTML doc install |
| 381 |
directory |
| 382 |
|
| 383 |
Provide ${PROJECT}_INSTALL_HTML variables (e.g. LLVM_INSTALL_HTML) to |
| 384 |
override Sphinx HTML doc install directory. |
| 385 |
|
| 386 |
-Fixes: https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 387 |
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 388 |
+Patch: https://reviews.llvm.org/D23757 |
| 389 |
--- |
| 390 |
cmake/modules/AddSphinxTarget.cmake | 8 ++++++-- |
| 391 |
1 file changed, 6 insertions(+), 2 deletions(-) |
| 392 |
|
| 393 |
diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake |
| 394 |
-index 045dc23..9c9c444 100644 |
| 395 |
+index 045dc23..fac143f 100644 |
| 396 |
--- a/cmake/modules/AddSphinxTarget.cmake |
| 397 |
+++ b/cmake/modules/AddSphinxTarget.cmake |
| 398 |
@@ -53,8 +53,12 @@ function (add_sphinx_target builder project) |
| 399 |
@@ -26,11 +27,11 @@ index 045dc23..9c9c444 100644 |
| 400 |
+ set(${project_upper}_INSTALL_HTML "share/doc/${project}/html" |
| 401 |
+ CACHE STRING "HTML documentation install directory for ${project}") |
| 402 |
+ |
| 403 |
-+ install(DIRECTORY "${SPHINX_BUILD_DIR}/" |
| 404 |
++ install(DIRECTORY "${SPHINX_BUILD_DIR}/." |
| 405 |
+ DESTINATION "${${project_upper}_INSTALL_HTML}") |
| 406 |
else() |
| 407 |
message(WARNING Installation of ${builder} not supported) |
| 408 |
endif() |
| 409 |
-- |
| 410 |
-2.4.3 |
| 411 |
+2.9.3 |
| 412 |
|
| 413 |
|
| 414 |
diff --git a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 415 |
similarity index 68% |
| 416 |
rename from sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 417 |
rename to sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 418 |
index b1c74c6..94a8157 100644 |
| 419 |
--- a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 420 |
+++ b/sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 421 |
@@ -1,23 +1,24 @@ |
| 422 |
-From 4f7092ba05cccfeea7d26177d93f3d7a57d9bce2 Mon Sep 17 00:00:00 2001 |
| 423 |
+From 2f798e87c10a93235a00e95c38e736f9ff7e991b Mon Sep 17 00:00:00 2001 |
| 424 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 425 |
Date: Mon, 8 Jun 2015 14:29:03 +0200 |
| 426 |
-Subject: [PATCH 3/4] cmake: Add an ordering dep between HTML & man Sphinx |
| 427 |
+Subject: [PATCH 04/10] cmake: Add an ordering dep between HTML & man Sphinx |
| 428 |
targets |
| 429 |
|
| 430 |
Add a dependency between HTML & manpage Sphinx targets to prevent two |
| 431 |
instances of Sphinx from running in parallel, and therefore solves race |
| 432 |
conditions reusing the same doctree directory. |
| 433 |
|
| 434 |
-Fixes: https://llvm.org/bugs/show_bug.cgi?id=23781 |
| 435 |
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23781 |
| 436 |
+Patch: https://reviews.llvm.org/D23755 |
| 437 |
--- |
| 438 |
docs/CMakeLists.txt | 3 +++ |
| 439 |
1 file changed, 3 insertions(+) |
| 440 |
|
| 441 |
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt |
| 442 |
-index da27627..63309a6 100644 |
| 443 |
+index f2cd7e9..179a65b 100644 |
| 444 |
--- a/docs/CMakeLists.txt |
| 445 |
+++ b/docs/CMakeLists.txt |
| 446 |
-@@ -100,6 +100,9 @@ if (LLVM_ENABLE_SPHINX) |
| 447 |
+@@ -109,6 +109,9 @@ if (LLVM_ENABLE_SPHINX) |
| 448 |
|
| 449 |
if (${SPHINX_OUTPUT_MAN}) |
| 450 |
add_sphinx_target(man llvm) |
| 451 |
@@ -28,5 +29,5 @@ index da27627..63309a6 100644 |
| 452 |
|
| 453 |
endif() |
| 454 |
-- |
| 455 |
-2.4.3 |
| 456 |
+2.9.3 |
| 457 |
|
| 458 |
|
| 459 |
diff --git a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch |
| 460 |
similarity index 72% |
| 461 |
rename from sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch |
| 462 |
rename to sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch |
| 463 |
index 92ca2e4..a24977c 100644 |
| 464 |
--- a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch |
| 465 |
+++ b/sys-devel/llvm/files/9999/0005-cmake-Do-not-install-libgtest.patch |
| 466 |
@@ -1,19 +1,21 @@ |
| 467 |
-From d9f80393cfd4e586242ac3efd4e6ba6b49ce39ae Mon Sep 17 00:00:00 2001 |
| 468 |
+From 1303993b5b9a4195ebe4930a8cd345c875e7f25c Mon Sep 17 00:00:00 2001 |
| 469 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 470 |
Date: Tue, 9 Jun 2015 11:58:52 +0200 |
| 471 |
-Subject: [PATCH 4/4] cmake: Do not install libgtest |
| 472 |
+Subject: [PATCH 05/10] cmake: Do not install libgtest |
| 473 |
|
| 474 |
libgtest is an internal test dependency, and should not be installed to |
| 475 |
the live system as a part of LLVM. |
| 476 |
+ |
| 477 |
+Bug: http://llvm.org/bugs/show_bug.cgi?id=18341 |
| 478 |
--- |
| 479 |
utils/unittest/CMakeLists.txt | 3 +++ |
| 480 |
1 file changed, 3 insertions(+) |
| 481 |
|
| 482 |
diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt |
| 483 |
-index b34e22a..3fe5884 100644 |
| 484 |
+index c9a2cdd..bb4f667 100644 |
| 485 |
--- a/utils/unittest/CMakeLists.txt |
| 486 |
+++ b/utils/unittest/CMakeLists.txt |
| 487 |
-@@ -41,6 +41,9 @@ if (PTHREAD_LIBRARY_PATH) |
| 488 |
+@@ -37,6 +37,9 @@ if (PTHREAD_LIBRARY_PATH) |
| 489 |
list(APPEND LIBS pthread) |
| 490 |
endif() |
| 491 |
|
| 492 |
@@ -24,5 +26,5 @@ index b34e22a..3fe5884 100644 |
| 493 |
googletest/src/gtest-all.cc |
| 494 |
|
| 495 |
-- |
| 496 |
-2.4.3 |
| 497 |
+2.9.3 |
| 498 |
|
| 499 |
|
| 500 |
diff --git a/sys-devel/llvm/files/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch b/sys-devel/llvm/files/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
| 501 |
new file mode 100644 |
| 502 |
index 0000000..8a2c091 |
| 503 |
--- /dev/null |
| 504 |
+++ b/sys-devel/llvm/files/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
| 505 |
@@ -0,0 +1,28 @@ |
| 506 |
+From a2ecd4815d285281cb816e06b25dc0dc2a933073 Mon Sep 17 00:00:00 2001 |
| 507 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 508 |
+Date: Sun, 21 Aug 2016 23:13:45 +0200 |
| 509 |
+Subject: [PATCH 06/10] cmake: Remove the CMAKE_BUILD_TYPE assertion |
| 510 |
+ |
| 511 |
+--- |
| 512 |
+ CMakeLists.txt | 5 ----- |
| 513 |
+ 1 file changed, 5 deletions(-) |
| 514 |
+ |
| 515 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 516 |
+index 894bc8c..453fcb8 100644 |
| 517 |
+--- a/CMakeLists.txt |
| 518 |
++++ b/CMakeLists.txt |
| 519 |
+@@ -232,11 +232,6 @@ endif() |
| 520 |
+ |
| 521 |
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) |
| 522 |
+ |
| 523 |
+-if (CMAKE_BUILD_TYPE AND |
| 524 |
+- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") |
| 525 |
+- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") |
| 526 |
+-endif() |
| 527 |
+- |
| 528 |
+ set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) |
| 529 |
+ |
| 530 |
+ set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") |
| 531 |
+-- |
| 532 |
+2.9.3 |
| 533 |
+ |
| 534 |
|
| 535 |
diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
| 536 |
similarity index 68% |
| 537 |
rename from sys-devel/llvm/files/llvm-3.9-llvm-config.patch |
| 538 |
rename to sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
| 539 |
index a1b0be9..968db45 100644 |
| 540 |
--- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch |
| 541 |
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
| 542 |
@@ -1,8 +1,8 @@ |
| 543 |
-From 93133d777fd4c9d5e0f0cc563927f303f9527159 Mon Sep 17 00:00:00 2001 |
| 544 |
+From 2dba8c81db58d7dd62c67379eaa175498a4370f2 Mon Sep 17 00:00:00 2001 |
| 545 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 546 |
Date: Sat, 20 Aug 2016 23:47:41 +0200 |
| 547 |
-Subject: [PATCH] llvm-config: Clean up exported values, update for shared |
| 548 |
- linking |
| 549 |
+Subject: [PATCH 07/10] llvm-config: Clean up exported values, update for |
| 550 |
+ shared linking |
| 551 |
|
| 552 |
Gentoo-specific fixup for llvm-config, including: |
| 553 |
- wiping build-specific CFLAGS, CXXFLAGS, |
| 554 |
@@ -24,7 +24,9 @@ diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt |
| 555 |
index 744fa4e..593788a 100644 |
| 556 |
--- a/tools/llvm-config/CMakeLists.txt |
| 557 |
+++ b/tools/llvm-config/CMakeLists.txt |
| 558 |
-@@ -34,4 +34,8 @@ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) |
| 559 |
+@@ -32,8 +32,12 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) |
| 560 |
+ set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) |
| 561 |
+ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) |
| 562 |
set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") |
| 563 |
-set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") |
| 564 |
-set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") |
| 565 |
@@ -35,25 +37,42 @@ index 744fa4e..593788a 100644 |
| 566 |
+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") |
| 567 |
+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") |
| 568 |
set(LLVM_BUILD_SYSTEM cmake) |
| 569 |
-@@ -48,3 +52,4 @@ set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") |
| 570 |
+ set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) |
| 571 |
+ set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}") |
| 572 |
+@@ -46,7 +50,8 @@ endif() |
| 573 |
+ # Use the C++ link flags, since they should be a superset of C link flags. |
| 574 |
+ set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") |
| 575 |
set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) |
| 576 |
-set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) |
| 577 |
+# We don't do static libs, so we don't need to supply any system-libs |
| 578 |
+set(LLVM_SYSTEM_LIBS "") |
| 579 |
if(BUILD_SHARED_LIBS) |
| 580 |
+ set(LLVM_ENABLE_SHARED ON) |
| 581 |
+ else() |
| 582 |
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp |
| 583 |
index c63733f..ead11b9 100644 |
| 584 |
--- a/tools/llvm-config/llvm-config.cpp |
| 585 |
+++ b/tools/llvm-config/llvm-config.cpp |
| 586 |
-@@ -524,3 +524,4 @@ int main(int argc, char **argv) { |
| 587 |
+@@ -522,7 +522,8 @@ int main(int argc, char **argv) { |
| 588 |
+ } else if (Arg == "--host-target") { |
| 589 |
+ OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n'; |
| 590 |
} else if (Arg == "--build-mode") { |
| 591 |
- OS << build_mode << '\n'; |
| 592 |
+ // force Release since we force non-standard Gentoo build mode |
| 593 |
+ OS << "Release" << '\n'; |
| 594 |
} else if (Arg == "--assertion-mode") { |
| 595 |
-@@ -540,5 +540,9 @@ int main(int argc, char **argv) { |
| 596 |
+ #if defined(NDEBUG) |
| 597 |
+ OS << "OFF\n"; |
| 598 |
+@@ -538,9 +539,17 @@ int main(int argc, char **argv) { |
| 599 |
+ } else if (Arg == "--shared-mode") { |
| 600 |
+ PrintSharedMode = true; |
| 601 |
} else if (Arg == "--obj-root") { |
| 602 |
- OS << ActivePrefix << '\n'; |
| 603 |
+- OS << ActivePrefix << '\n'; |
| 604 |
++ if (IsInDevelopmentTree) { |
| 605 |
++ OS << ActivePrefix << '\n'; |
| 606 |
++ } else { |
| 607 |
++ OS << "/dev/null\n"; |
| 608 |
++ } |
| 609 |
} else if (Arg == "--src-root") { |
| 610 |
- OS << LLVM_SRC_ROOT << '\n'; |
| 611 |
+ if (IsInDevelopmentTree) { |
| 612 |
@@ -62,6 +81,8 @@ index c63733f..ead11b9 100644 |
| 613 |
+ OS << "/dev/null\n"; |
| 614 |
+ } |
| 615 |
} else if (Arg == "--link-shared") { |
| 616 |
+ LinkMode = LinkModeShared; |
| 617 |
+ } else if (Arg == "--link-static") { |
| 618 |
-- |
| 619 |
2.9.3 |
| 620 |
|
| 621 |
|
| 622 |
diff --git a/sys-devel/llvm/files/llvm-3.8-soversion.patch b/sys-devel/llvm/files/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch |
| 623 |
similarity index 74% |
| 624 |
rename from sys-devel/llvm/files/llvm-3.8-soversion.patch |
| 625 |
rename to sys-devel/llvm/files/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch |
| 626 |
index 1a30643..c333bc4 100644 |
| 627 |
--- a/sys-devel/llvm/files/llvm-3.8-soversion.patch |
| 628 |
+++ b/sys-devel/llvm/files/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch |
| 629 |
@@ -1,17 +1,17 @@ |
| 630 |
-From 3da7d5f7f928aa2aa5e7436b27908bb7e7eb3cc1 Mon Sep 17 00:00:00 2001 |
| 631 |
+From 597ebcc28580a8532f6634e2a723901c3448b9ff Mon Sep 17 00:00:00 2001 |
| 632 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 633 |
Date: Mon, 28 Mar 2016 22:21:19 +0200 |
| 634 |
-Subject: [PATCH] cmake: Restore SOVERSIONs on shared libraries |
| 635 |
+Subject: [PATCH 08/10] cmake: Restore SOVERSIONs on shared libraries |
| 636 |
|
| 637 |
--- |
| 638 |
cmake/modules/AddLLVM.cmake | 5 +++++ |
| 639 |
1 file changed, 5 insertions(+) |
| 640 |
|
| 641 |
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake |
| 642 |
-index a829751..a7e0688 100644 |
| 643 |
+index 9590a1b..83a2359 100644 |
| 644 |
--- a/cmake/modules/AddLLVM.cmake |
| 645 |
+++ b/cmake/modules/AddLLVM.cmake |
| 646 |
-@@ -436,6 +436,11 @@ function(llvm_add_library name) |
| 647 |
+@@ -445,6 +445,11 @@ function(llvm_add_library name) |
| 648 |
PREFIX "" |
| 649 |
) |
| 650 |
endif() |
| 651 |
@@ -24,5 +24,5 @@ index a829751..a7e0688 100644 |
| 652 |
|
| 653 |
if(ARG_MODULE OR ARG_SHARED) |
| 654 |
-- |
| 655 |
-2.7.4 |
| 656 |
+2.9.3 |
| 657 |
|
| 658 |
|
| 659 |
diff --git a/sys-devel/llvm/files/llvm-3.8-musl-fixes.patch b/sys-devel/llvm/files/9999/musl-fixes.patch |
| 660 |
similarity index 100% |
| 661 |
rename from sys-devel/llvm/files/llvm-3.8-musl-fixes.patch |
| 662 |
rename to sys-devel/llvm/files/9999/musl-fixes.patch |
| 663 |
|
| 664 |
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch |
| 665 |
deleted file mode 100644 |
| 666 |
index d53ce19..0000000 |
| 667 |
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch |
| 668 |
+++ /dev/null |
| 669 |
@@ -1,12 +0,0 @@ |
| 670 |
-diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt |
| 671 |
---- llvm-3.7.0.src.orig/docs/CMakeLists.txt 2015-08-18 18:48:44.000000000 +0200 |
| 672 |
-+++ llvm-3.7.0.src/docs/CMakeLists.txt 2015-10-12 14:40:00.985384589 +0200 |
| 673 |
-@@ -115,7 +115,7 @@ |
| 674 |
- endif() |
| 675 |
- |
| 676 |
- list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml) |
| 677 |
--if( NOT uses_ocaml LESS 0 ) |
| 678 |
-+if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS ) |
| 679 |
- set(doc_targets |
| 680 |
- ocaml_llvm |
| 681 |
- ocaml_llvm_all_backends |
| 682 |
|
| 683 |
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch |
| 684 |
deleted file mode 100644 |
| 685 |
index 024bad7..0000000 |
| 686 |
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch |
| 687 |
+++ /dev/null |
| 688 |
@@ -1,43 +0,0 @@ |
| 689 |
---- llvm-3.7.0rc3.src-orig/cmake/modules/AddOCaml.cmake 2015-06-08 05:22:22.000000000 +1000 |
| 690 |
-+++ llvm-3.7.0rc3.src/cmake/modules/AddOCaml.cmake 2015-08-30 19:22:37.216580808 +1000 |
| 691 |
-@@ -131,7 +131,7 @@ |
| 692 |
- if( APPLE ) |
| 693 |
- set(ocaml_rpath "@executable_path/../../lib") |
| 694 |
- elseif( UNIX ) |
| 695 |
-- set(ocaml_rpath "\\$ORIGIN/../../lib") |
| 696 |
-+ set(ocaml_rpath "\\$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}") |
| 697 |
- endif() |
| 698 |
- list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") |
| 699 |
- |
| 700 |
-@@ -183,12 +183,12 @@ |
| 701 |
- endforeach() |
| 702 |
- |
| 703 |
- install(FILES ${install_files} |
| 704 |
-- DESTINATION lib/ocaml) |
| 705 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) |
| 706 |
- install(FILES ${install_shlibs} |
| 707 |
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE |
| 708 |
- GROUP_READ GROUP_EXECUTE |
| 709 |
- WORLD_READ WORLD_EXECUTE |
| 710 |
-- DESTINATION lib/ocaml) |
| 711 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) |
| 712 |
- |
| 713 |
- foreach( install_file ${install_files} ${install_shlibs} ) |
| 714 |
- get_filename_component(filename "${install_file}" NAME) |
| 715 |
---- llvm-3.7.0rc3.src-orig/bindings/ocaml/backends/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100 |
| 716 |
-+++ llvm-3.7.0rc3.src/bindings/ocaml/backends/CMakeLists.txt 2015-08-30 19:23:49.726583886 +1000 |
| 717 |
-@@ -23,5 +23,5 @@ |
| 718 |
- "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}") |
| 719 |
- |
| 720 |
- install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}" |
| 721 |
-- DESTINATION lib/ocaml) |
| 722 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) |
| 723 |
- endforeach() |
| 724 |
---- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100 |
| 725 |
-+++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt 2015-08-30 19:23:43.561583624 +1000 |
| 726 |
-@@ -8,4 +8,4 @@ |
| 727 |
- "${LLVM_LIBRARY_DIR}/ocaml/META.llvm") |
| 728 |
- |
| 729 |
- install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm" |
| 730 |
-- DESTINATION lib/ocaml) |
| 731 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) |
| 732 |
|
| 733 |
diff --git a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch |
| 734 |
deleted file mode 100644 |
| 735 |
index e42c08a..0000000 |
| 736 |
--- a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch |
| 737 |
+++ /dev/null |
| 738 |
@@ -1,14 +0,0 @@ |
| 739 |
---- a/CMakeLists.txt 2015-08-12 20:04:55.397881480 +0200 |
| 740 |
-+++ b/CMakeLists.txt 2015-08-12 20:05:06.625741113 +0200 |
| 741 |
-@@ -152,11 +152,6 @@ |
| 742 |
- |
| 743 |
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) |
| 744 |
- |
| 745 |
--if (CMAKE_BUILD_TYPE AND |
| 746 |
-- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") |
| 747 |
-- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") |
| 748 |
--endif() |
| 749 |
-- |
| 750 |
- set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) |
| 751 |
- |
| 752 |
- # They are used as destination of target generators. |
| 753 |
|
| 754 |
diff --git a/sys-devel/llvm/llvm-3.5.0.ebuild b/sys-devel/llvm/llvm-3.5.0.ebuild |
| 755 |
index d6019fc..e163d97 100644 |
| 756 |
--- a/sys-devel/llvm/llvm-3.5.0.ebuild |
| 757 |
+++ b/sys-devel/llvm/llvm-3.5.0.ebuild |
| 758 |
@@ -143,18 +143,18 @@ src_unpack() { |
| 759 |
} |
| 760 |
|
| 761 |
src_prepare() { |
| 762 |
- epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch |
| 763 |
- epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch |
| 764 |
- epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch |
| 765 |
+ epatch "${FILESDIR}"/3.6.2/nodoctargz.patch |
| 766 |
+ epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch |
| 767 |
+ epatch "${FILESDIR}"/3.5.2/gentoo-install.patch |
| 768 |
|
| 769 |
- epatch "${FILESDIR}"/${P}-fix_LLVMExports_cmake.patch |
| 770 |
+ epatch "${FILESDIR}"/3.5.0/fix_LLVMExports_cmake.patch |
| 771 |
|
| 772 |
if use clang; then |
| 773 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 774 |
- epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 775 |
+ epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 776 |
|
| 777 |
- epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch |
| 778 |
- epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch |
| 779 |
+ epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch |
| 780 |
+ epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch |
| 781 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 782 |
fi |
| 783 |
|
| 784 |
|
| 785 |
diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild |
| 786 |
index 6d3a5ce..e158a2d 100644 |
| 787 |
--- a/sys-devel/llvm/llvm-3.5.2.ebuild |
| 788 |
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild |
| 789 |
@@ -144,19 +144,19 @@ src_unpack() { |
| 790 |
} |
| 791 |
|
| 792 |
src_prepare() { |
| 793 |
- epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch |
| 794 |
- epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch |
| 795 |
- epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch |
| 796 |
- epatch "${FILESDIR}"/${P}-gcc-5.1.patch |
| 797 |
+ epatch "${FILESDIR}"/3.6.2/nodoctargz.patch |
| 798 |
+ epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch |
| 799 |
+ epatch "${FILESDIR}"/3.5.2/gentoo-install.patch |
| 800 |
+ epatch "${FILESDIR}"/3.5.2/gcc-5.1.patch |
| 801 |
# Make ocaml warnings non-fatal, bug #537308 |
| 802 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/Ocaml/*ml || die |
| 803 |
|
| 804 |
if use clang; then |
| 805 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 806 |
- epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 807 |
+ epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 808 |
|
| 809 |
- epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch |
| 810 |
- epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch |
| 811 |
+ epatch "${FILESDIR}"/3.5.2/clang/gentoo-install.patch |
| 812 |
+ epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch |
| 813 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 814 |
fi |
| 815 |
|
| 816 |
|
| 817 |
diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild |
| 818 |
index 3512fbb..c0bede2 100644 |
| 819 |
--- a/sys-devel/llvm/llvm-3.6.2.ebuild |
| 820 |
+++ b/sys-devel/llvm/llvm-3.6.2.ebuild |
| 821 |
@@ -148,23 +148,23 @@ src_unpack() { |
| 822 |
} |
| 823 |
|
| 824 |
src_prepare() { |
| 825 |
- epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch |
| 826 |
- epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch |
| 827 |
- epatch "${FILESDIR}"/${PN}-3.6-gentoo-install.patch |
| 828 |
- epatch "${FILESDIR}"/${PN}-3.6.0-ocaml-ctypes-0.4.0.patch |
| 829 |
+ epatch "${FILESDIR}"/3.6.2/nodoctargz.patch |
| 830 |
+ epatch "${FILESDIR}"/3.6.2/gcc-4.9.patch |
| 831 |
+ epatch "${FILESDIR}"/3.6.2/gentoo-install.patch |
| 832 |
+ epatch "${FILESDIR}"/3.6.2/ocaml-ctypes-0.4.0.patch |
| 833 |
# Make ocaml warnings non-fatal, bug #537308 |
| 834 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
| 835 |
|
| 836 |
if use clang; then |
| 837 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 838 |
- epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 839 |
+ epatch "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 840 |
|
| 841 |
- epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch |
| 842 |
- epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch |
| 843 |
+ epatch "${FILESDIR}"/3.7.1/clang/gentoo-install.patch |
| 844 |
+ epatch "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch |
| 845 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 846 |
|
| 847 |
# Fix build fails with using gcc-4.9 on Gentoo/FreeBSD, bug #548444 |
| 848 |
- epatch "${FILESDIR}"/clang-3.6-fbsd-gcc49.patch |
| 849 |
+ epatch "${FILESDIR}"/3.6.2/clang/fbsd-gcc49.patch |
| 850 |
fi |
| 851 |
|
| 852 |
if use prefix && use clang; then |
| 853 |
|
| 854 |
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 855 |
index 5f6e184..c35f38f 100644 |
| 856 |
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 857 |
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 858 |
@@ -141,21 +141,21 @@ src_prepare() { |
| 859 |
# Make ocaml warnings non-fatal, bug #537308 |
| 860 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
| 861 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 862 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch |
| 863 |
+ eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 864 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 865 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch |
| 866 |
+ eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 867 |
|
| 868 |
# Make it possible to override Sphinx HTML install dirs |
| 869 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 870 |
- eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 871 |
+ eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 872 |
|
| 873 |
# Prevent race conditions with parallel Sphinx runs |
| 874 |
# https://llvm.org/bugs/show_bug.cgi?id=23781 |
| 875 |
- eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 876 |
+ eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 877 |
|
| 878 |
# Prevent installing libgtest |
| 879 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 880 |
- eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch |
| 881 |
+ eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 882 |
|
| 883 |
# Fix llvm-config for shared linking, sane flags and return values |
| 884 |
# in order: |
| 885 |
@@ -165,49 +165,49 @@ src_prepare() { |
| 886 |
# - backported r260343 that fixes cross-compilation |
| 887 |
# combination of backported upstream r252532 with our patch |
| 888 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
| 889 |
- eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-0.patch |
| 890 |
- eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-1.patch |
| 891 |
- eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-2.patch |
| 892 |
- eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-3.patch |
| 893 |
+ eapply "${FILESDIR}"/3.7.1/llvm-config-0.patch |
| 894 |
+ eapply "${FILESDIR}"/3.7.1/llvm-config-1.patch |
| 895 |
+ eapply "${FILESDIR}"/3.7.1/llvm-config-2.patch |
| 896 |
+ eapply "${FILESDIR}"/3.7.1/llvm-config-3.patch |
| 897 |
|
| 898 |
# Fix msan with newer kernels, #569894 |
| 899 |
- eapply "${FILESDIR}"/llvm-3.7-msan-fix.patch |
| 900 |
+ eapply "${FILESDIR}"/3.7.1/msan-fix.patch |
| 901 |
|
| 902 |
# disable use of SDK on OSX, bug #568758 |
| 903 |
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
| 904 |
|
| 905 |
if use clang; then |
| 906 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 907 |
- eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 908 |
+ eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 909 |
|
| 910 |
# Support gcc4.9 search paths |
| 911 |
# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3 |
| 912 |
- eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch |
| 913 |
+ eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch |
| 914 |
|
| 915 |
- eapply "${FILESDIR}"/clang-3.6-gentoo-install.patch |
| 916 |
+ eapply "${FILESDIR}"/3.7.1/clang/gentoo-install.patch |
| 917 |
|
| 918 |
- eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch |
| 919 |
+ eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch |
| 920 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 921 |
|
| 922 |
# Fix -isystem support in ccc-analyzer |
| 923 |
- eapply "${FILESDIR}"/clang-3.7.1-ccc-analyzer-isystem.patch |
| 924 |
+ eapply "${FILESDIR}"/3.7.1/clang/ccc-analyzer-isystem.patch |
| 925 |
|
| 926 |
sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ |
| 927 |
tools/clang/tools/scan-build/scan-build || die |
| 928 |
|
| 929 |
# Install clang runtime into /usr/lib/clang |
| 930 |
# https://llvm.org/bugs/show_bug.cgi?id=23792 |
| 931 |
- eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 932 |
- eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 933 |
+ eapply "${FILESDIR}"/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 934 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 935 |
|
| 936 |
# Do not force -march flags on arm platforms |
| 937 |
# https://bugs.gentoo.org/show_bug.cgi?id=562706 |
| 938 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-compiler_rt_arm_march_flags.patch |
| 939 |
+ eapply "${FILESDIR}"/3.7.1/compiler-rt/arm_march_flags.patch |
| 940 |
|
| 941 |
# Make it possible to override CLANG_LIBDIR_SUFFIX |
| 942 |
# (that is used only to find LLVMgold.so) |
| 943 |
# https://llvm.org/bugs/show_bug.cgi?id=23793 |
| 944 |
- eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 945 |
+ eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 946 |
|
| 947 |
# Fix git-clang-format shebang, bug #562688 |
| 948 |
python_fix_shebang tools/clang/tools/clang-format/git-clang-format |
| 949 |
@@ -215,7 +215,7 @@ src_prepare() { |
| 950 |
pushd projects/compiler-rt >/dev/null || die |
| 951 |
|
| 952 |
# Fix msan with newer kernels, compiler-rt part, #569894 |
| 953 |
- eapply "${FILESDIR}"/compiler-rt-3.7-msan-fix.patch |
| 954 |
+ eapply "${FILESDIR}"/3.7.1/compiler-rt/msan-fix.patch |
| 955 |
|
| 956 |
# Fix WX sections, bug #421527 |
| 957 |
find lib/builtins -type f -name '*.S' -exec sed \ |
| 958 |
@@ -232,13 +232,13 @@ src_prepare() { |
| 959 |
-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die |
| 960 |
|
| 961 |
# Fix Python paths, bugs #562436 and #562438 |
| 962 |
- eapply "${FILESDIR}"/${PN}-3.7-lldb_python.patch |
| 963 |
+ eapply "${FILESDIR}"/3.7.1/lldb/python.patch |
| 964 |
sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \ |
| 965 |
-i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die |
| 966 |
|
| 967 |
# Fix build with ncurses[tinfo], #560474 |
| 968 |
# http://llvm.org/viewvc/llvm-project?view=revision&revision=247842 |
| 969 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-lldb_tinfo.patch |
| 970 |
+ eapply "${FILESDIR}"/3.7.1/lldb/tinfo.patch |
| 971 |
fi |
| 972 |
|
| 973 |
# User patches |
| 974 |
|
| 975 |
diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 976 |
index 98b01a8..5196fe4 100644 |
| 977 |
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 978 |
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 979 |
@@ -142,32 +142,32 @@ src_prepare() { |
| 980 |
# Make ocaml warnings non-fatal, bug #537308 |
| 981 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
| 982 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 983 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch |
| 984 |
+ eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 985 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 986 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch |
| 987 |
+ eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 988 |
|
| 989 |
# Make it possible to override Sphinx HTML install dirs |
| 990 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 991 |
- eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 992 |
+ eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 993 |
|
| 994 |
# Prevent race conditions with parallel Sphinx runs |
| 995 |
# https://llvm.org/bugs/show_bug.cgi?id=23781 |
| 996 |
- eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 997 |
+ eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 998 |
|
| 999 |
# Prevent installing libgtest |
| 1000 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 1001 |
- eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch |
| 1002 |
+ eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 1003 |
|
| 1004 |
# Allow custom cmake build types (like 'Gentoo') |
| 1005 |
- eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch |
| 1006 |
+ eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
| 1007 |
|
| 1008 |
# Fix llvm-config for shared linking and sane flags |
| 1009 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
| 1010 |
- eapply "${FILESDIR}"/llvm-3.8-llvm-config.patch |
| 1011 |
+ eapply "${FILESDIR}"/3.8.1/llvm-config.patch |
| 1012 |
|
| 1013 |
# Restore SOVERSIONs for shared libraries |
| 1014 |
# https://bugs.gentoo.org/show_bug.cgi?id=578392 |
| 1015 |
- eapply "${FILESDIR}"/llvm-3.8-soversion.patch |
| 1016 |
+ eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch |
| 1017 |
|
| 1018 |
# disable use of SDK on OSX, bug #568758 |
| 1019 |
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
| 1020 |
@@ -177,13 +177,13 @@ src_prepare() { |
| 1021 |
|
| 1022 |
if use clang; then |
| 1023 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 1024 |
- eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 1025 |
+ eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 1026 |
|
| 1027 |
# Support gcc4.9 search paths |
| 1028 |
# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3 |
| 1029 |
- eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch |
| 1030 |
+ eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch |
| 1031 |
|
| 1032 |
- eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch |
| 1033 |
+ eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch |
| 1034 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 1035 |
|
| 1036 |
sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ |
| 1037 |
@@ -191,24 +191,24 @@ src_prepare() { |
| 1038 |
|
| 1039 |
# Install clang runtime into /usr/lib/clang |
| 1040 |
# https://llvm.org/bugs/show_bug.cgi?id=23792 |
| 1041 |
- eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
| 1042 |
- eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 1043 |
+ eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 1044 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 1045 |
|
| 1046 |
# Do not force -march flags on arm platforms |
| 1047 |
# https://bugs.gentoo.org/show_bug.cgi?id=562706 |
| 1048 |
- eapply "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch |
| 1049 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/arm_march_flags.patch |
| 1050 |
|
| 1051 |
# Make it possible to override CLANG_LIBDIR_SUFFIX |
| 1052 |
# (that is used only to find LLVMgold.so) |
| 1053 |
# https://llvm.org/bugs/show_bug.cgi?id=23793 |
| 1054 |
- eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 1055 |
+ eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 1056 |
|
| 1057 |
# Fix git-clang-format shebang, bug #562688 |
| 1058 |
python_fix_shebang tools/clang/tools/clang-format/git-clang-format |
| 1059 |
|
| 1060 |
# Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064 |
| 1061 |
# https://llvm.org/bugs/show_bug.cgi?id=26651 |
| 1062 |
- eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch |
| 1063 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/fbsd.patch |
| 1064 |
|
| 1065 |
pushd projects/compiler-rt >/dev/null || die |
| 1066 |
|
| 1067 |
@@ -226,7 +226,7 @@ src_prepare() { |
| 1068 |
sed -e 's/add_subdirectory(readline)/#&/' \ |
| 1069 |
-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die |
| 1070 |
# Do not install bundled six module |
| 1071 |
- eapply "${FILESDIR}"/${PN}-3.8-lldb_six.patch |
| 1072 |
+ eapply "${FILESDIR}"/3.8.1/lldb/six.patch |
| 1073 |
fi |
| 1074 |
|
| 1075 |
# User patches |
| 1076 |
|
| 1077 |
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 1078 |
index 2e78867..5fdffd0 100644 |
| 1079 |
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 1080 |
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 1081 |
@@ -143,38 +143,38 @@ src_prepare() { |
| 1082 |
# Make ocaml warnings non-fatal, bug #537308 |
| 1083 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
| 1084 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 1085 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch |
| 1086 |
+ eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 1087 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 1088 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch |
| 1089 |
+ eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 1090 |
|
| 1091 |
# Make it possible to override Sphinx HTML install dirs |
| 1092 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 1093 |
- eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 1094 |
+ eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 1095 |
|
| 1096 |
# Prevent race conditions with parallel Sphinx runs |
| 1097 |
# https://llvm.org/bugs/show_bug.cgi?id=23781 |
| 1098 |
- eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 1099 |
+ eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 1100 |
|
| 1101 |
# Prevent installing libgtest |
| 1102 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 1103 |
- eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch |
| 1104 |
+ eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 1105 |
|
| 1106 |
# Allow custom cmake build types (like 'Gentoo') |
| 1107 |
- eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch |
| 1108 |
+ eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
| 1109 |
|
| 1110 |
# Fix llvm-config for shared linking and sane flags |
| 1111 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
| 1112 |
- eapply "${FILESDIR}"/llvm-3.8-llvm-config-r1.patch |
| 1113 |
+ eapply "${FILESDIR}"/3.8.1/llvm-config-r1.patch |
| 1114 |
|
| 1115 |
# Restore SOVERSIONs for shared libraries |
| 1116 |
# https://bugs.gentoo.org/show_bug.cgi?id=578392 |
| 1117 |
- eapply "${FILESDIR}"/llvm-3.8-soversion.patch |
| 1118 |
+ eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch |
| 1119 |
|
| 1120 |
# support building llvm against musl-libc |
| 1121 |
- use elibc_musl && eapply "${FILESDIR}"/llvm-3.8-musl-fixes.patch |
| 1122 |
+ use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch |
| 1123 |
|
| 1124 |
# support "musl" as a valid environment type in llvm |
| 1125 |
- eapply "${FILESDIR}"/llvm-3.8-musl-support.patch |
| 1126 |
+ eapply "${FILESDIR}"/3.8.1/musl-env-support.patch |
| 1127 |
|
| 1128 |
# disable use of SDK on OSX, bug #568758 |
| 1129 |
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
| 1130 |
@@ -184,21 +184,21 @@ src_prepare() { |
| 1131 |
|
| 1132 |
if use clang; then |
| 1133 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 1134 |
- eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 1135 |
+ eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 1136 |
|
| 1137 |
# Support gcc4.9 search paths |
| 1138 |
# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3 |
| 1139 |
- eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch |
| 1140 |
+ eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch |
| 1141 |
|
| 1142 |
- eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch |
| 1143 |
+ eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch |
| 1144 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 1145 |
|
| 1146 |
pushd "${S}"/tools/clang >/dev/null || die |
| 1147 |
# be able to specify default values for -stdlib and -rtlib at build time |
| 1148 |
- eapply "${FILESDIR}"/clang-3.8-default-libs.patch |
| 1149 |
+ eapply "${FILESDIR}"/3.8.1/clang/default-libs.patch |
| 1150 |
|
| 1151 |
# enable clang to recognize musl-libc |
| 1152 |
- eapply "${FILESDIR}"/clang-3.8-musl-support.patch |
| 1153 |
+ eapply "${FILESDIR}"/3.8.1/clang/musl-support.patch |
| 1154 |
popd >/dev/null || die |
| 1155 |
|
| 1156 |
sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ |
| 1157 |
@@ -206,28 +206,28 @@ src_prepare() { |
| 1158 |
|
| 1159 |
# Install clang runtime into /usr/lib/clang |
| 1160 |
# https://llvm.org/bugs/show_bug.cgi?id=23792 |
| 1161 |
- eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
| 1162 |
- eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 1163 |
+ eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 1164 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 1165 |
|
| 1166 |
# Do not force -march flags on arm platforms |
| 1167 |
# https://bugs.gentoo.org/show_bug.cgi?id=562706 |
| 1168 |
- eapply "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch |
| 1169 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/arm_march_flags.patch |
| 1170 |
|
| 1171 |
# Make it possible to override CLANG_LIBDIR_SUFFIX |
| 1172 |
# (that is used only to find LLVMgold.so) |
| 1173 |
# https://llvm.org/bugs/show_bug.cgi?id=23793 |
| 1174 |
- eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 1175 |
+ eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 1176 |
|
| 1177 |
# Fix git-clang-format shebang, bug #562688 |
| 1178 |
python_fix_shebang tools/clang/tools/clang-format/git-clang-format |
| 1179 |
|
| 1180 |
# Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064 |
| 1181 |
# https://llvm.org/bugs/show_bug.cgi?id=26651 |
| 1182 |
- eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch |
| 1183 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/fbsd.patch |
| 1184 |
|
| 1185 |
# Backport abi-tag support, bug #571600 |
| 1186 |
- eapply "${FILESDIR}"/clang-3.8-abi-tag-support-sema.patch |
| 1187 |
- eapply "${FILESDIR}"/clang-3.8-abi-tag-support-mangler.patch |
| 1188 |
+ eapply "${FILESDIR}"/3.8.1/clang/abi-tag-support-sema.patch |
| 1189 |
+ eapply "${FILESDIR}"/3.8.1/clang/abi-tag-support-mangler.patch |
| 1190 |
|
| 1191 |
pushd projects/compiler-rt >/dev/null || die |
| 1192 |
|
| 1193 |
@@ -245,7 +245,7 @@ src_prepare() { |
| 1194 |
sed -e 's/add_subdirectory(readline)/#&/' \ |
| 1195 |
-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die |
| 1196 |
# Do not install bundled six module |
| 1197 |
- eapply "${FILESDIR}"/${PN}-3.8-lldb_six.patch |
| 1198 |
+ eapply "${FILESDIR}"/3.8.1/lldb/six.patch |
| 1199 |
fi |
| 1200 |
|
| 1201 |
# User patches |
| 1202 |
|
| 1203 |
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 1204 |
index cc7982b..c00669d 100644 |
| 1205 |
--- a/sys-devel/llvm/llvm-3.8.1.ebuild |
| 1206 |
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 1207 |
@@ -142,32 +142,32 @@ src_prepare() { |
| 1208 |
# Make ocaml warnings non-fatal, bug #537308 |
| 1209 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
| 1210 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 1211 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch |
| 1212 |
+ eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 1213 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 1214 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch |
| 1215 |
+ eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 1216 |
|
| 1217 |
# Make it possible to override Sphinx HTML install dirs |
| 1218 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 1219 |
- eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 1220 |
+ eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 1221 |
|
| 1222 |
# Prevent race conditions with parallel Sphinx runs |
| 1223 |
# https://llvm.org/bugs/show_bug.cgi?id=23781 |
| 1224 |
- eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 1225 |
+ eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 1226 |
|
| 1227 |
# Prevent installing libgtest |
| 1228 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 1229 |
- eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch |
| 1230 |
+ eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 1231 |
|
| 1232 |
# Allow custom cmake build types (like 'Gentoo') |
| 1233 |
- eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch |
| 1234 |
+ eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
| 1235 |
|
| 1236 |
# Fix llvm-config for shared linking and sane flags |
| 1237 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
| 1238 |
- eapply "${FILESDIR}"/llvm-3.8-llvm-config.patch |
| 1239 |
+ eapply "${FILESDIR}"/3.8.1/llvm-config.patch |
| 1240 |
|
| 1241 |
# Restore SOVERSIONs for shared libraries |
| 1242 |
# https://bugs.gentoo.org/show_bug.cgi?id=578392 |
| 1243 |
- eapply "${FILESDIR}"/llvm-3.8-soversion.patch |
| 1244 |
+ eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch |
| 1245 |
|
| 1246 |
# disable use of SDK on OSX, bug #568758 |
| 1247 |
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
| 1248 |
@@ -177,13 +177,13 @@ src_prepare() { |
| 1249 |
|
| 1250 |
if use clang; then |
| 1251 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 1252 |
- eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 1253 |
+ eapply "${FILESDIR}"/3.8.1/clang/gentoo-runtime-gcc-detection-v3.patch |
| 1254 |
|
| 1255 |
# Support gcc4.9 search paths |
| 1256 |
# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3 |
| 1257 |
- eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch |
| 1258 |
+ eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch |
| 1259 |
|
| 1260 |
- eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch |
| 1261 |
+ eapply "${FILESDIR}"/3.8.1/clang/darwin_prefix-include-paths.patch |
| 1262 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 1263 |
|
| 1264 |
sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ |
| 1265 |
@@ -191,24 +191,24 @@ src_prepare() { |
| 1266 |
|
| 1267 |
# Install clang runtime into /usr/lib/clang |
| 1268 |
# https://llvm.org/bugs/show_bug.cgi?id=23792 |
| 1269 |
- eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
| 1270 |
- eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 1271 |
+ eapply "${FILESDIR}"/3.8.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch |
| 1272 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
| 1273 |
|
| 1274 |
# Do not force -march flags on arm platforms |
| 1275 |
# https://bugs.gentoo.org/show_bug.cgi?id=562706 |
| 1276 |
- eapply "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch |
| 1277 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/arm_march_flags.patch |
| 1278 |
|
| 1279 |
# Make it possible to override CLANG_LIBDIR_SUFFIX |
| 1280 |
# (that is used only to find LLVMgold.so) |
| 1281 |
# https://llvm.org/bugs/show_bug.cgi?id=23793 |
| 1282 |
- eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 1283 |
+ eapply "${FILESDIR}"/3.8.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
| 1284 |
|
| 1285 |
# Fix git-clang-format shebang, bug #562688 |
| 1286 |
python_fix_shebang tools/clang/tools/clang-format/git-clang-format |
| 1287 |
|
| 1288 |
# Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064 |
| 1289 |
# https://llvm.org/bugs/show_bug.cgi?id=26651 |
| 1290 |
- eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch |
| 1291 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/fbsd.patch |
| 1292 |
|
| 1293 |
pushd projects/compiler-rt >/dev/null || die |
| 1294 |
|
| 1295 |
@@ -226,7 +226,7 @@ src_prepare() { |
| 1296 |
sed -e 's/add_subdirectory(readline)/#&/' \ |
| 1297 |
-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die |
| 1298 |
# Do not install bundled six module |
| 1299 |
- eapply "${FILESDIR}"/${PN}-3.8-lldb_six.patch |
| 1300 |
+ eapply "${FILESDIR}"/3.8.1/lldb/six.patch |
| 1301 |
fi |
| 1302 |
|
| 1303 |
# User patches |
| 1304 |
|
| 1305 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
| 1306 |
index 556bf07..1a7dc68 100644 |
| 1307 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
| 1308 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
| 1309 |
@@ -93,32 +93,32 @@ src_prepare() { |
| 1310 |
# Make ocaml warnings non-fatal, bug #537308 |
| 1311 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
| 1312 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 1313 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch |
| 1314 |
+ eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 1315 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 1316 |
- eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch |
| 1317 |
+ eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 1318 |
|
| 1319 |
# Make it possible to override Sphinx HTML install dirs |
| 1320 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 1321 |
- eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 1322 |
+ eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
| 1323 |
|
| 1324 |
# Prevent race conditions with parallel Sphinx runs |
| 1325 |
# https://llvm.org/bugs/show_bug.cgi?id=23781 |
| 1326 |
- eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 1327 |
+ eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
| 1328 |
|
| 1329 |
# Prevent installing libgtest |
| 1330 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
| 1331 |
- eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch |
| 1332 |
+ eapply "${FILESDIR}"/9999/0005-cmake-Do-not-install-libgtest.patch |
| 1333 |
|
| 1334 |
# Allow custom cmake build types (like 'Gentoo') |
| 1335 |
- eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch |
| 1336 |
+ eapply "${FILESDIR}"/9999/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
| 1337 |
|
| 1338 |
# Fix llvm-config for shared linking and sane flags |
| 1339 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
| 1340 |
- eapply "${FILESDIR}"/llvm-3.9-llvm-config.patch |
| 1341 |
+ eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
| 1342 |
|
| 1343 |
# Restore SOVERSIONs for shared libraries |
| 1344 |
# https://bugs.gentoo.org/show_bug.cgi?id=578392 |
| 1345 |
- eapply "${FILESDIR}"/llvm-3.8-soversion.patch |
| 1346 |
+ eapply "${FILESDIR}"/9999/0008-cmake-Restore-SOVERSIONs-on-shared-libraries.patch |
| 1347 |
|
| 1348 |
# Fix lit tests to find installed llvm-lit correctly |
| 1349 |
eapply "${FILESDIR}"/9999/0009-cmake-Use-system-llvm-lit-when-lit.py-does-not-exist.patch |
| 1350 |
@@ -126,7 +126,7 @@ src_prepare() { |
| 1351 |
eapply "${FILESDIR}"/9999/0010-lit-setup.py-Install-as-llvm-lit-as-cmake-expects-it.patch |
| 1352 |
|
| 1353 |
# support building llvm against musl-libc |
| 1354 |
- use elibc_musl && eapply "${FILESDIR}"/llvm-3.8-musl-fixes.patch |
| 1355 |
+ use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch |
| 1356 |
|
| 1357 |
# disable use of SDK on OSX, bug #568758 |
| 1358 |
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
Archives