From 27da88bfb716580d5418b448c19574fc2a798d13 Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Thu, 10 Oct 2019 16:48:14 +0200 Subject: [PATCH] clang: fix lldb CMake when epydoc is present See https://bugs.llvm.org/show_bug.cgi?id=43637 --- ...hen-LLDB_DISABLE_PYTHON-if-ON-and-ep.patch | 39 +++++++++++++++++++ mingw-w64-clang/PKGBUILD | 5 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 mingw-w64-clang/0510-fix-CMake-when-LLDB_DISABLE_PYTHON-if-ON-and-ep.patch diff --git a/mingw-w64-clang/0510-fix-CMake-when-LLDB_DISABLE_PYTHON-if-ON-and-ep.patch b/mingw-w64-clang/0510-fix-CMake-when-LLDB_DISABLE_PYTHON-if-ON-and-ep.patch new file mode 100644 index 0000000000..1ad697a8f1 --- /dev/null +++ b/mingw-w64-clang/0510-fix-CMake-when-LLDB_DISABLE_PYTHON-if-ON-and-ep.patch @@ -0,0 +1,39 @@ +From: oscar +Date: Thu, 10 Oct 2019 16:33:54 +0200 +Subject: [PATCH] lldb: fix CMake when LLDB_DISABLE_PYTHON if ON and epydoc is + present + +https://bugs.llvm.org/show_bug.cgi?id=43637 + +--- + docs/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index bfdd50badf6..a15f0e2db38 100644 +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt +@@ -18,7 +18,11 @@ endif() + find_program(EPYDOC_EXECUTABLE NAMES epydoc epydoc.py) + if(EPYDOC_EXECUTABLE) + message(STATUS "Found epydoc - ${EPYDOC_EXECUTABLE}") ++else() ++ message(STATUS "Could NOT find epydoc") ++endif() + ++if(NOT LLDB_DISABLE_PYTHON AND EPYDOC_EXECUTABLE) + find_program(DOT_EXECUTABLE dot) + if(DOT_EXECUTABLE) + set(EPYDOC_OPTIONS ${EPYDOC_OPTIONS} --graph all --dotpath ${DOT_EXECUTABLE}) +@@ -49,8 +53,6 @@ if(EPYDOC_EXECUTABLE) + COMMENT "Generating LLDB Python API reference with epydoc" VERBATIM + ) + add_dependencies(lldb-python-doc swig_wrapper lldb-python-doc-package) +-else() +- message(STATUS "Could NOT find epydoc") + endif() + + if (LLVM_ENABLE_SPHINX) +-- +2.23.0 + diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 122668d268..023389e85b 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -91,6 +91,7 @@ source=(${_url}/$pkgver/llvm-${pkgver}.src.tar.xz{,.sig} "0507-declare-exports-for-all-windows-platforms.patch" "0508-add-share-header.patch" "0509-include-crtdbg.patch" + "0510-fix-CMake-when-LLDB_DISABLE_PYTHON-if-ON-and-ep.patch" "0601-fix-static-assert-macro.patch" "0701-disable-visibility-annotations.patch" "0801-Don-t-build-LLVMPolly-on-WIN32.patch") @@ -154,6 +155,7 @@ sha256sums=('d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84' '78d52a2e11b3e6d0acbaab8b603921674dfed70062bf3aaf37ce1961de68d416' 'dc656168d3e3067e57b342fbd9a9eb57dd95d8d8e540e7e66e48c3cea790bbb3' 'f065285abd6bf5f67599a82f8c2338c57c1c5b4b3088b5d62c12356c3703f74e' + '963387da0ff24e167c91d193def2f5a7581dca41166f73b8914fcf8fd636101f' 'b9727a84f6e412ef9ace5f1b4030ccbc8789a6f1ef74cc09f95dfa9118515b8a' 'eaa7ad87e3f0fc9ff697c8865cce5c501fcb3a71a9a29c9497e444013163976f' 'bc394e597f8939b6f6630bd88c990f951738aaadacded2f3be71c658e9608fe7') @@ -230,7 +232,8 @@ prepare() { "0506-mingw-python-posix-like.patch" \ "0507-declare-exports-for-all-windows-platforms.patch" \ "0508-add-share-header.patch" \ - "0509-include-crtdbg.patch" + "0509-include-crtdbg.patch" \ + "0510-fix-CMake-when-LLDB_DISABLE_PYTHON-if-ON-and-ep.patch" cd "${srcdir}/libunwind-${pkgver}.src" apply_patch_with_msg \