| 1 |
commit: 7c9bce27e20c323962a0a0becd6828778ff3e3cc |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 23 20:29:39 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 23 20:32:15 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9bce27 |
| 7 |
|
| 8 |
sys-devel/llvm: OCaml doc patch has been applied upstream |
| 9 |
|
| 10 |
.../0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch | 0 |
| 11 |
sys-devel/llvm/llvm-3.7.1-r3.ebuild | 2 +- |
| 12 |
sys-devel/llvm/llvm-3.8.0-r3.ebuild | 2 +- |
| 13 |
sys-devel/llvm/llvm-3.8.1-r2.ebuild | 2 +- |
| 14 |
sys-devel/llvm/llvm-3.8.1.ebuild | 2 +- |
| 15 |
sys-devel/llvm/llvm-9999.ebuild | 2 -- |
| 16 |
6 files changed, 4 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-devel/llvm/files/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch b/sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 19 |
similarity index 100% |
| 20 |
rename from sys-devel/llvm/files/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 21 |
rename to sys-devel/llvm/files/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 22 |
|
| 23 |
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 24 |
index c35f38f..02635d1 100644 |
| 25 |
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 26 |
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 27 |
@@ -143,7 +143,7 @@ src_prepare() { |
| 28 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 29 |
eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 30 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 31 |
- eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 32 |
+ eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 33 |
|
| 34 |
# Make it possible to override Sphinx HTML install dirs |
| 35 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 36 |
|
| 37 |
diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 38 |
index 5196fe4..7bd13a8 100644 |
| 39 |
--- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 40 |
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
| 41 |
@@ -144,7 +144,7 @@ src_prepare() { |
| 42 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 43 |
eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 44 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 45 |
- eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 46 |
+ eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 47 |
|
| 48 |
# Make it possible to override Sphinx HTML install dirs |
| 49 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 50 |
|
| 51 |
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 52 |
index 5fdffd0..7f096fc 100644 |
| 53 |
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 54 |
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 55 |
@@ -145,7 +145,7 @@ src_prepare() { |
| 56 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 57 |
eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 58 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 59 |
- eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 60 |
+ eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 61 |
|
| 62 |
# Make it possible to override Sphinx HTML install dirs |
| 63 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 64 |
|
| 65 |
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 66 |
index c00669d..22ae082 100644 |
| 67 |
--- a/sys-devel/llvm/llvm-3.8.1.ebuild |
| 68 |
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 69 |
@@ -144,7 +144,7 @@ src_prepare() { |
| 70 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 71 |
eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 72 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 73 |
- eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 74 |
+ eapply "${FILESDIR}"/3.8.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 75 |
|
| 76 |
# Make it possible to override Sphinx HTML install dirs |
| 77 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
| 78 |
|
| 79 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
| 80 |
index 1a7dc68..9a16879 100644 |
| 81 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
| 82 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
| 83 |
@@ -94,8 +94,6 @@ src_prepare() { |
| 84 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
| 85 |
# Fix libdir for ocaml bindings install, bug #559134 |
| 86 |
eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch |
| 87 |
- # Do not build/install ocaml docs with USE=-doc, bug #562008 |
| 88 |
- eapply "${FILESDIR}"/9999/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch |
| 89 |
|
| 90 |
# Make it possible to override Sphinx HTML install dirs |
| 91 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
Archives