sys-devel/llvm: cleaner fix for #553416

Package-Manager: portage-2.2.20.1

diff --git a/sys-devel/llvm/llvm-3.7.0-r1.ebuild b/sys-devel/llvm/llvm-3.7.0-r1.ebuild
index c1ef867a7a80c98fb9129054a3bb3deb06c8571b..068f1b80eaae5b71ada452eb7e2c0fdc44e2281d 100644 (file)
--- 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 8776cf8ee05c1a0ceb7e340e7f6cc5c159c79252..1d0a6e61a795180612c24a0262a056c4dc930a9e 100644 (file)
--- 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
                )