pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lldb-git: Renegerate local trial patches.
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Mon Nov 30 03:39:10 2015 +0100
Changeset: a83fcc4aa2398cf733ef0e3e2ce4b25f70196bda
Modified Files:
lldb-git/distinfo
Added Files:
lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
lldb-git/patches/patch-lldb_source_Initialization_SystemInitializerCommon.cpp
Removed Files:
lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp
Log Message:
lldb-git: Renegerate local trial patches.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a83fcc4aa2398cf733ef0e3e2ce4b25f70196bda
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-lldb_cmake_modules_LLDBStandalone.cmake | 152 +++++++++++++++++++++
...urce_Initialization_SystemInitializerCommon.cpp | 20 +++
...urce-Initialization-SystemInitializerCommon.cpp | 20 ---
4 files changed, 174 insertions(+), 21 deletions(-)
diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 728ca91..2621cbb 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,4 +12,5 @@ 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-source-Initialization-SystemInitializerCommon.cpp) = 6c1afcccdaae97960c79faa7c83dee5001cc2a17
+SHA1 (patch-lldb_cmake_modules_LLDBStandalone.cmake) = 460ea4faa354ba9e04014203af9dd952ef719da1
+SHA1 (patch-lldb_source_Initialization_SystemInitializerCommon.cpp) = 6c1afcccdaae97960c79faa7c83dee5001cc2a17
diff --git a/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake b/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
new file mode 100644
index 0000000..9d8a8c7
--- /dev/null
+++ b/lldb-git/patches/patch-lldb_cmake_modules_LLDBStandalone.cmake
@@ -0,0 +1,152 @@
+$NetBSD$
+
+--- lldb/cmake/modules/LLDBStandalone.cmake.orig 2015-11-18 04:51:18.000000000 +0000
++++ lldb/cmake/modules/LLDBStandalone.cmake
+@@ -6,57 +6,77 @@ 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}/share/llvm/cmake")
+-
+- 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}/share/llvm/cmake")
++ 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)
+@@ -73,9 +93,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")
+ endif()
+
+ set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
+@@ -83,13 +103,8 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+ 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-lldb_source_Initialization_SystemInitializerCommon.cpp b/lldb-git/patches/patch-lldb_source_Initialization_SystemInitializerCommon.cpp
new file mode 100644
index 0000000..47dca67
--- /dev/null
+++ b/lldb-git/patches/patch-lldb_source_Initialization_SystemInitializerCommon.cpp
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- lldb/source/Initialization/SystemInitializerCommon.cpp.orig 2015-11-18 04:51:19.000000000 +0000
++++ lldb/source/Initialization/SystemInitializerCommon.cpp
+@@ -115,6 +115,7 @@ SystemInitializerCommon::Initialize()
+ DynamicLoaderWindowsDYLD::Initialize();
+ platform_freebsd::PlatformFreeBSD::Initialize();
+ platform_linux::PlatformLinux::Initialize();
++ platform_netbsd::PlatformNetBSD::Initialize();
+ PlatformWindows::Initialize();
+ PlatformKalimba::Initialize();
+ platform_android::PlatformAndroid::Initialize();
+@@ -162,6 +163,7 @@ SystemInitializerCommon::Terminate()
+ DynamicLoaderWindowsDYLD::Terminate();
+ platform_freebsd::PlatformFreeBSD::Terminate();
+ platform_linux::PlatformLinux::Terminate();
++ platform_netbsd::PlatformNetBSD::Terminate();
+ PlatformWindows::Terminate();
+ PlatformKalimba::Terminate();
+ platform_android::PlatformAndroid::Terminate();
diff --git a/lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp b/lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp
deleted file mode 100644
index 47dca67..0000000
--- a/lldb-git/patches/patch-source-Initialization-SystemInitializerCommon.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- lldb/source/Initialization/SystemInitializerCommon.cpp.orig 2015-11-18 04:51:19.000000000 +0000
-+++ lldb/source/Initialization/SystemInitializerCommon.cpp
-@@ -115,6 +115,7 @@ SystemInitializerCommon::Initialize()
- DynamicLoaderWindowsDYLD::Initialize();
- platform_freebsd::PlatformFreeBSD::Initialize();
- platform_linux::PlatformLinux::Initialize();
-+ platform_netbsd::PlatformNetBSD::Initialize();
- PlatformWindows::Initialize();
- PlatformKalimba::Initialize();
- platform_android::PlatformAndroid::Initialize();
-@@ -162,6 +163,7 @@ SystemInitializerCommon::Terminate()
- DynamicLoaderWindowsDYLD::Terminate();
- platform_freebsd::PlatformFreeBSD::Terminate();
- platform_linux::PlatformLinux::Terminate();
-+ platform_netbsd::PlatformNetBSD::Terminate();
- PlatformWindows::Terminate();
- PlatformKalimba::Terminate();
- platform_android::PlatformAndroid::Terminate();
Home |
Main Index |
Thread Index |
Old Index