lldb-git: Revamp patch for StandaloneBuild

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Feb 6 01:08:16 2016 +0100
Changeset:	359819ad40b53f571f7050d3c72b4a3f790d9f35

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake

Log Message:
lldb-git: Revamp patch for StandaloneBuild

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=359819ad40b53f571f7050d3c72b4a3f790d9f35

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-git/distinfo                                  |  2 +-
 .../patch-lldb_cmake_modules_LLDBStandalone.cmake  | 25 +++++++++++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index fdc6051..da43e30 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,7 +12,7 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-lldb_cmake_modules_LLDBStandalone.cmake) = 1c6a0a3a084dca924b44e28b990d3a86220b7297
+SHA1 (patch-lldb_cmake_modules_LLDBStandalone.cmake) = 843343c57a1c7887158022e1554760b9e8a35661
 SHA1 (patch-lldb_include_lldb_Utility_regcclass.h) = c50fe5382aab03ab6b8bd4db165069c66e84bbb3
 SHA1 (patch-lldb_include_lldb_Utility_regcname.h) = d51af35e60c484736c743045d17215168be68b21
 SHA1 (patch-lldb_include_lldb_Utility_regengine.inc) = 8c317afaa5bcd8ea4c95afc09544f28160f8903b
diff --git a/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake b/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
index 287c918..04620e7 100644
--- a/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
+++ b/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lldb/cmake/modules/LLDBStandalone.cmake.orig	2015-12-06 02:57:30.000000000 +0000
+--- lldb/cmake/modules/LLDBStandalone.cmake.orig	2016-02-05 23:28:46.000000000 +0000
 +++ lldb/cmake/modules/LLDBStandalone.cmake
-@@ -6,57 +6,77 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+@@ -6,57 +6,78 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
  
    option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
  
@@ -41,6 +41,7 @@ $NetBSD$
 +      string(REGEX REPLACE
 +        "[ \t]*[\r\n]+[ \t]*" ";"
 +        CONFIG_OUTPUT ${CONFIG_OUTPUT})
++
      else()
 -      get_filename_component(LLVM_MAIN_SRC_DIR ${LLDB_PATH_TO_LLVM_SOURCE}
 -                             ABSOLUTE)
@@ -58,7 +59,7 @@ $NetBSD$
 -      set(CLANG_MAIN_INCLUDE_DIR "${CLANG_MAIN_SRC_DIR}/include")
 -  endif()
 -
--  list(APPEND CMAKE_MODULE_PATH "${LLDB_PATH_TO_LLVM_BUILD}/share/llvm/cmake")
+-  list(APPEND CMAKE_MODULE_PATH "${LLDB_PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
 -
 -  if (LLDB_PATH_TO_LLVM_BUILD)
 -    get_filename_component(PATH_TO_LLVM_BUILD ${LLDB_PATH_TO_LLVM_BUILD}
@@ -95,7 +96,7 @@ $NetBSD$
 +  find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
 +    NO_DEFAULT_PATH)
 +
-+  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
++  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
 +  set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
 +  if(EXISTS ${LLVMCONFIG_FILE})
 +    list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
@@ -121,20 +122,20 @@ $NetBSD$
  
    include(AddLLVM)
    include(HandleLLVMOptions)
-@@ -73,9 +93,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+@@ -73,9 +94,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
      message("-- Found PythonInterp: ${PYTHON_EXECUTABLE}")
    endif()
    # Import CMake library targets from LLVM and Clang.
--  include("${LLDB_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
--  if (EXISTS "${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
--      include("${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
-+  include("${LLVM_OBJ_ROOT}/share/llvm/cmake/LLVMConfig.cmake")
-+  if (EXISTS "${LLVM_OBJ_ROOT}/share/clang/cmake/ClangConfig.cmake")
-+      include("${LLVM_OBJ_ROOT}/share/clang/cmake/ClangConfig.cmake")
+-  include("${LLDB_PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
+-  if (EXISTS "${LLDB_PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
+-      include("${LLDB_PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
++  include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
++  if (EXISTS "${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/cmake/ClangConfig.cmake")
++      include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
    endif()
  
    set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
-@@ -83,13 +103,8 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+@@ -83,13 +104,8 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
    set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})
  
    set(CMAKE_INCLUDE_CURRENT_DIR ON)