llvm 3.9: fix more docs issues

This commit is contained in:
Dave Airlie 2016-09-19 09:43:53 +10:00
parent 1805a94f1f
commit da62168279
2 changed files with 46 additions and 0 deletions

View file

@ -0,0 +1,44 @@
From f12c36b2bc2e1db86098c181b88b8003c595e63c Mon Sep 17 00:00:00 2001
From: Renato Golin <renato.golin@linaro.org>
Date: Wed, 20 Jul 2016 09:47:09 +0000
Subject: [PATCH] [docs] fix cmake code-block warning
This will unblock the llvm-sphinx-buildbot, which is currently failing due
to a warning being treated as error.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@276100 91177308-0d34-0410-b5e6-96231b3b80d8
---
docs/CMakePrimer.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/CMakePrimer.rst b/docs/CMakePrimer.rst
index 0347790..1e3a09e 100644
--- a/docs/CMakePrimer.rst
+++ b/docs/CMakePrimer.rst
@@ -246,11 +246,11 @@ In general CMake if blocks work the way you'd expect:
.. code-block:: cmake
if(<condition>)
- .. do stuff
+ message("do stuff")
elseif(<condition>)
- .. do other stuff
+ message("do other stuff")
else()
- .. do other other stuff
+ message("do other other stuff")
endif()
The single most important thing to know about CMake's if blocks coming from a C
@@ -265,7 +265,7 @@ The most common form of the CMake ``foreach`` block is:
.. code-block:: cmake
foreach(var ...)
- .. do stuff
+ message("do stuff")
endforeach()
The variable argument portion of the ``foreach`` block can contain dereferenced
--
2.5.5

View file

@ -22,6 +22,7 @@ Patch0: llvm-3.7.1-cmake-s390.patch
Patch1: 0001-This-code-block-breaks-the-docs-build-http-lab.llvm..patch Patch1: 0001-This-code-block-breaks-the-docs-build-http-lab.llvm..patch
Patch2: 0001-fix-docs-2.patch Patch2: 0001-fix-docs-2.patch
Patch3: 0001-fix-docs-3.patch Patch3: 0001-fix-docs-3.patch
Patch4: 0001-docs-fix-cmake-code-block-warning.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -77,6 +78,7 @@ Static libraries for the LLVM compiler infrastructure.
%patch1 -p1 -b .sphinx %patch1 -p1 -b .sphinx
%patch2 -p1 -b .docs2 %patch2 -p1 -b .docs2
%patch3 -p1 -b .docs3 %patch3 -p1 -b .docs3
%patch4 -p1 -b .docs4
%build %build
mkdir -p _build mkdir -p _build