From da6216827983183c2b1b734e732c54969e4bf659 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 19 Sep 2016 09:43:53 +1000 Subject: [PATCH] llvm 3.9: fix more docs issues --- 0001-docs-fix-cmake-code-block-warning.patch | 44 ++++++++++++++++++++ llvm.spec | 2 + 2 files changed, 46 insertions(+) create mode 100644 0001-docs-fix-cmake-code-block-warning.patch diff --git a/0001-docs-fix-cmake-code-block-warning.patch b/0001-docs-fix-cmake-code-block-warning.patch new file mode 100644 index 0000000..da63112 --- /dev/null +++ b/0001-docs-fix-cmake-code-block-warning.patch @@ -0,0 +1,44 @@ +From f12c36b2bc2e1db86098c181b88b8003c595e63c Mon Sep 17 00:00:00 2001 +From: Renato Golin +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() +- .. do stuff ++ message("do stuff") + elseif() +- .. 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 + diff --git a/llvm.spec b/llvm.spec index 19890db..d546a1a 100644 --- a/llvm.spec +++ b/llvm.spec @@ -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 Patch2: 0001-fix-docs-2.patch Patch3: 0001-fix-docs-3.patch +Patch4: 0001-docs-fix-cmake-code-block-warning.patch BuildRequires: cmake BuildRequires: zlib-devel @@ -77,6 +78,7 @@ Static libraries for the LLVM compiler infrastructure. %patch1 -p1 -b .sphinx %patch2 -p1 -b .docs2 %patch3 -p1 -b .docs3 +%patch4 -p1 -b .docs4 %build mkdir -p _build