lldb-git: Remove patches applied upstream

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: lldb-git: Remove patches applied upstream
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Thu, 12 May 2016 20:12:48 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu May 12 22:12:48 2016 +0200
Changeset:	aaab4361e6247daee74d35d02cdf441e647edecb

Modified Files:
	lldb-git/distinfo
Removed Files:
	lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
	lldb-git/patches/patch-include_lldb_Host_Editline.h
	lldb-git/patches/patch-scripts_CMakeLists.txt

Log Message:
lldb-git: Remove patches applied upstream

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

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

diffstat:
 lldb-git/distinfo                                  |   3 -
 .../patch-cmake_modules_LLDBStandalone.cmake       | 154 ---------------------
 .../patches/patch-include_lldb_Host_Editline.h     |  18 ---
 lldb-git/patches/patch-scripts_CMakeLists.txt      |  13 --
 4 files changed, 188 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 72ef92f..1fc170f 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,15 +12,12 @@ 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-cmake_modules_LLDBStandalone.cmake) = dda67c4816abbb2fcd6cf6737ab5f33ce82e0a9b
-SHA1 (patch-include_lldb_Host_Editline.h) = 827868031cb68946ad4e68f01b9071e44be8c679
 SHA1 (patch-include_lldb_Utility_regcclass.h) = 9ed649e8deb5924feaf82a6e675f5c596367b3d6
 SHA1 (patch-include_lldb_Utility_regcname.h) = b67145f0437d3c09adc33a925d49267cd9ba4fd7
 SHA1 (patch-include_lldb_Utility_regengine.inc) = a031c43a63acab80a97cfb7727326d610d4ad9ab
 SHA1 (patch-include_lldb_Utility_regex2.h) = 822a47b1221368ec5442bfbdbc20fe4e370c1a6b
 SHA1 (patch-include_lldb_Utility_regex__impl.h) = 4d99669a756bd662ae28abc8cefe6e1538ef84b6
 SHA1 (patch-include_lldb_Utility_regutils.h) = ea36409f8cd05dcf9b81144cbc136abc5fc3a190
-SHA1 (patch-scripts_CMakeLists.txt) = 1f9515a9c615aab15ac6955894664e2187a5da88
 SHA1 (patch-source_Host_netbsd_HostThreadNetBSD.cpp) = 23a310a2d899d1e92008f399d59d8dd0648bdccc
 SHA1 (patch-source_Plugins_Process_CMakeLists.txt) = 895b469f32c4bec510a98d34b6af3a642523d4f2
 SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = 44ffa80b20b64f87f2f396c0b65a039b2352dc5a
diff --git a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake b/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
deleted file mode 100644
index 0e797cb..0000000
--- a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
+++ /dev/null
@@ -1,154 +0,0 @@
-$NetBSD$
-
---- cmake/modules/LLDBStandalone.cmake.orig	2016-05-01 10:39:36.000000000 +0000
-+++ cmake/modules/LLDBStandalone.cmake
-@@ -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)
- 
--  set(LLDB_PATH_TO_LLVM_SOURCE "" CACHE PATH
--    "Path to LLVM source code. Not necessary if using an installed LLVM.")
--  set(LLDB_PATH_TO_LLVM_BUILD "" CACHE PATH
--    "Path to the directory where LLVM was built or installed.")
--
--  set(LLDB_PATH_TO_CLANG_SOURCE "" CACHE PATH
--    "Path to Clang source code. Not necessary if using an installed Clang.")
--  set(LLDB_PATH_TO_CLANG_BUILD "" CACHE PATH
--    "Path to the directory where Clang was built or installed.")
--
--  if (LLDB_PATH_TO_LLVM_SOURCE)
--    if (NOT EXISTS "${LLDB_PATH_TO_LLVM_SOURCE}/cmake/config-ix.cmake")
--      message(FATAL_ERROR "Please set LLDB_PATH_TO_LLVM_SOURCE to the root "
--              "directory of LLVM source code.")
-+  # Rely on llvm-config.
-+  set(CONFIG_OUTPUT)
-+  find_program(LLVM_CONFIG "llvm-config")
-+  if(LLVM_CONFIG)
-+    message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")
-+    set(CONFIG_COMMAND ${LLVM_CONFIG}
-+      "--assertion-mode"
-+      "--bindir"
-+      "--libdir"
-+      "--includedir"
-+      "--prefix"
-+      "--src-root")
-+    execute_process(
-+      COMMAND ${CONFIG_COMMAND}
-+      RESULT_VARIABLE HAD_ERROR
-+      OUTPUT_VARIABLE CONFIG_OUTPUT
-+    )
-+    if(NOT HAD_ERROR)
-+      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)
--      set(LLVM_MAIN_INCLUDE_DIR "${LLVM_MAIN_SRC_DIR}/include")
--      list(APPEND CMAKE_MODULE_PATH "${LLVM_MAIN_SRC_DIR}/cmake/modules")
-+      string(REPLACE ";" " " CONFIG_COMMAND_STR "${CONFIG_COMMAND}")
-+      message(STATUS "${CONFIG_COMMAND_STR}")
-+      message(FATAL_ERROR "llvm-config failed with status ${HAD_ERROR}")
-     endif()
--  endif()
--
--  if (LLDB_PATH_TO_CLANG_SOURCE)
--      get_filename_component(CLANG_MAIN_SRC_DIR ${LLDB_PATH_TO_CLANG_SOURCE}
--                             ABSOLUTE)
--      set(CLANG_MAIN_INCLUDE_DIR "${CLANG_MAIN_SRC_DIR}/include")
--  endif()
--
--  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}
--                           ABSOLUTE)
-   else()
--    message(FATAL_ERROR "Please set LLDB_PATH_TO_LLVM_BUILD to the root "
--            "directory of LLVM build or install site.")
-+    message(FATAL_ERROR "llvm-config not found -- ${LLVM_CONFIG}")
-   endif()
- 
--  if (LLDB_PATH_TO_CLANG_BUILD)
--    get_filename_component(PATH_TO_CLANG_BUILD ${LLDB_PATH_TO_CLANG_BUILD}
--                           ABSOLUTE)
-+  list(GET CONFIG_OUTPUT 0 ENABLE_ASSERTIONS)
-+  list(GET CONFIG_OUTPUT 1 TOOLS_BINARY_DIR)
-+  list(GET CONFIG_OUTPUT 2 LIBRARY_DIR)
-+  list(GET CONFIG_OUTPUT 3 INCLUDE_DIR)
-+  list(GET CONFIG_OUTPUT 4 LLVM_OBJ_ROOT)
-+  list(GET CONFIG_OUTPUT 5 MAIN_SRC_DIR)
-+
-+  if(NOT MSVC_IDE)
-+    set(LLVM_ENABLE_ASSERTIONS ${ENABLE_ASSERTIONS}
-+      CACHE BOOL "Enable assertions")
-+    # Assertions should follow llvm-config's.
-+    mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
-+  endif()
-+
-+  set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
-+  set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
-+  set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
-+  set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
-+  set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
-+
-+  find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
-+    NO_DEFAULT_PATH)
-+
-+  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}")
-+    include(${LLVMCONFIG_FILE})
-   else()
--    message(FATAL_ERROR "Please set LLDB_PATH_TO_CLANG_BUILD to the root "
--            "directory of Clang build or install site.")
-+    message(FATAL_ERROR "Not found: ${LLVMCONFIG_FILE}")
-   endif()
- 
--
--  # These variables are used by add_llvm_library.
-+  # They are used as destination of target generators.
-   set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
-   set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
--  set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
-+  if(WIN32 OR CYGWIN)
-+    # DLL platform -- put DLLs into bin.
-+    set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-+  else()
-+    set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
-+  endif()
- 
-   include(AddLLVM)
-   include(HandleLLVMOptions)
-@@ -72,24 +93,18 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
-   else()
-     message("-- Found PythonInterp: ${PYTHON_EXECUTABLE}")
-   endif()
-+
-   # Import CMake library targets from LLVM and Clang.
--  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")
--  endif()
-+  include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
-+  include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
- 
-   set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
- 
-   set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})
- 
-   set(CMAKE_INCLUDE_CURRENT_DIR ON)
--  include_directories("${PATH_TO_LLVM_BUILD}/include"
--                      "${LLVM_MAIN_INCLUDE_DIR}"
--                      "${PATH_TO_CLANG_BUILD}/include"
--                      "${CLANG_MAIN_INCLUDE_DIR}"
--                      "${CMAKE_CURRENT_SOURCE_DIR}/source")
--  link_directories("${PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}"
--                   "${PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}")
-+  include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
-+  link_directories("${LLVM_LIBRARY_DIR}")
- 
-   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
diff --git a/lldb-git/patches/patch-include_lldb_Host_Editline.h b/lldb-git/patches/patch-include_lldb_Host_Editline.h
deleted file mode 100644
index 299e559..0000000
--- a/lldb-git/patches/patch-include_lldb_Host_Editline.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- include/lldb/Host/Editline.h.orig	2016-05-01 10:39:36.000000000 +0000
-+++ include/lldb/Host/Editline.h
-@@ -27,11 +27,12 @@
- 
- #include <sstream>
- #include <vector>
-+#include <locale>
- 
- // components needed to handle wide characters ( <codecvt>, codecvt_utf8, libedit built with '--enable-widec' )
- // are not consistenly available on non-OSX platforms.  The wchar_t versions of libedit functions will only be
- // used in cases where this is true.  This is a compile time dependecy, for now selected per target Platform
--#if defined (__APPLE__)
-+#if defined (__APPLE__) || defined(__NetBSD__)
- #define LLDB_EDITLINE_USE_WCHAR 1
- #include <codecvt>
- #else
diff --git a/lldb-git/patches/patch-scripts_CMakeLists.txt b/lldb-git/patches/patch-scripts_CMakeLists.txt
deleted file mode 100644
index fd3acf6..0000000
--- a/lldb-git/patches/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- scripts/CMakeLists.txt.orig	2016-05-01 10:39:36.000000000 +0000
-+++ scripts/CMakeLists.txt
-@@ -9,6 +9,8 @@ set(SWIG_HEADERS
-   ${LLDB_SOURCE_DIR}/include/lldb/lldb-versioning.h
- )
- 
-+include(FindPythonInterp)
-+
- find_package(SWIG REQUIRED)
- add_custom_command(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
Prev by Date: slurm-devel: Remove WRKDIR references from example Makefile
Next by Date: Update VIPS to version 8.3.1
Previous by Thread: slurm-devel: Remove WRKDIR references from example Makefile
Next by Thread: Update VIPS to version 8.3.1
Indexes:
Home | Main Index | Thread Index | Old Index