[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/

[Bernard Cafarelli]

commit:     0f3970d43b90f05c54268e36e5b22b3a3d75b394
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 14:35:19 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 14:35:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3970d4

sys-devel/llvm: cleaner fix for #553416

Package-Manager: portage-2.2.20.1

 sys-devel/llvm/llvm-3.7.0-r1.ebuild | 4 +---
 sys-devel/llvm/llvm-9999.ebuild     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys-devel/llvm/llvm-3.7.0-r1.ebuild 
b/sys-devel/llvm/llvm-3.7.0-r1.ebuild
index c1ef867..068f1b8 100644
--- a/sys-devel/llvm/llvm-3.7.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0-r1.ebuild
@@ -186,9 +186,6 @@ src_prepare() {
                find "${S}"/projects/compiler-rt/lib/builtins -type f -name 
\*.S -exec sed \
                         -e '$a\\n#if defined(__linux__) && 
defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
                         -i {} \; || die
-
-               # Workaround bug #553416 until upstream fixes it
-               epatch "${FILESDIR}"/clang-3.7-strip_doc_refs.patch
        fi
 
        if use lldb; then
@@ -275,6 +272,7 @@ multilib_src_configure() {
                        -DLLVM_ENABLE_SPHINX=$(usex doc)
                        -DLLVM_ENABLE_DOXYGEN=OFF
                        
-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+                       -DSPHINX_WARNINGS_AS_ERRORS=OFF
                        -DLLVM_INSTALL_UTILS=ON
                )
 

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 8776cf8..1d0a6e6 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -196,9 +196,6 @@ src_prepare() {
                find "${S}"/projects/compiler-rt/lib/builtins -type f -name 
\*.S -exec sed \
                         -e '$a\\n#if defined(__linux__) && 
defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
                         -i {} \; || die
-
-               # Workaround bug #553416 until upstream fixes it
-               epatch "${FILESDIR}"/clang-3.7-strip_doc_refs.patch
        fi
 
        if use lldb; then
@@ -285,6 +282,7 @@ multilib_src_configure() {
                        -DLLVM_ENABLE_SPHINX=$(usex doc)
                        -DLLVM_ENABLE_DOXYGEN=OFF
                        
-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+                       -DSPHINX_WARNINGS_AS_ERRORS=OFF
                        -DLLVM_INSTALL_UTILS=ON
                )