SHA256
1
0
forked from pool/llvm
Ismail Dönmez 2015-03-02 15:19:56 +00:00 committed by Git OBS Bridge
parent 1d86e4459f
commit e030ffc8bd
4 changed files with 43 additions and 6 deletions

View File

@ -1,8 +1,8 @@
Index: lldb-3.6.0.src/source/lldb.cpp Index: lldb-3.6.0.src/source/lldb.cpp
=================================================================== ===================================================================
--- lldb-3.6.0.src/source/lldb.cpp --- lldb-3.6.0.src.orig/source/lldb.cpp
+++ lldb-3.6.0.src/source/lldb.cpp +++ lldb-3.6.0.src/source/lldb.cpp
@@ -299,11 +299,7 @@ extern "C" const unsigned char liblldb_c @@ -325,11 +325,7 @@ extern "C" const unsigned char liblldb_c
static const char * static const char *
GetLLDBRevision() GetLLDBRevision()
{ {
@ -16,7 +16,7 @@ Index: lldb-3.6.0.src/source/lldb.cpp
static const char * static const char *
Index: lldb-3.6.0.src/source/Core/IOHandler.cpp Index: lldb-3.6.0.src/source/Core/IOHandler.cpp
=================================================================== ===================================================================
--- lldb-3.6.0.src/source/Core/IOHandler.cpp --- lldb-3.6.0.src.orig/source/Core/IOHandler.cpp
+++ lldb-3.6.0.src/source/Core/IOHandler.cpp +++ lldb-3.6.0.src/source/Core/IOHandler.cpp
@@ -31,8 +31,8 @@ @@ -31,8 +31,8 @@
#include "lldb/Target/ThreadPlan.h" #include "lldb/Target/ThreadPlan.h"
@ -29,3 +29,38 @@ Index: lldb-3.6.0.src/source/Core/IOHandler.cpp
#endif #endif
using namespace lldb; using namespace lldb;
Index: lldb-3.6.0.src/CMakeLists.txt
===================================================================
--- lldb-3.6.0.src.orig/CMakeLists.txt
+++ lldb-3.6.0.src/CMakeLists.txt
@@ -83,7 +83,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
# Import CMake library targets from LLVM and Clang.
include("${LLDB_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
- include("${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
+ # include("${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
Index: lldb-3.6.0.src/cmake/LLDBDependencies.cmake
===================================================================
--- lldb-3.6.0.src.orig/cmake/LLDBDependencies.cmake
+++ lldb-3.6.0.src/cmake/LLDBDependencies.cmake
@@ -132,7 +132,7 @@ set( CLANG_USED_LIBS
set(LLDB_SYSTEM_LIBS)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" AND NOT __ANDROID_NDK__)
- list(APPEND LLDB_SYSTEM_LIBS edit panel ncurses)
+ list(APPEND LLDB_SYSTEM_LIBS edit panel ncurses dl pthread)
endif()
# On FreeBSD backtrace() is provided by libexecinfo, not libc.
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
@@ -165,6 +165,8 @@ set( LLVM_LINK_COMPONENTS
mcdisassembler
executionengine
option
+ support
+ runtimedyld
)
if ( NOT LLDB_DISABLE_PYTHON )

View File

@ -3,7 +3,8 @@ Mon Mar 2 10:14:22 UTC 2015 - idonmez@suse.com
- Update to version 3.6.0 - Update to version 3.6.0
* No changelog upstream * No changelog upstream
- Remove lldb-underlink.patch, fixed upstream - Merge lldb-underlink.patch into lldb-cmake.patch
- Swich to static library build, shared build is not supported
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 17 13:26:34 UTC 2014 - idonmez@suse.com Wed Sep 17 13:26:34 UTC 2014 - idonmez@suse.com

View File

@ -78,6 +78,7 @@ cmake -DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_CXX_COMPILER=clang++ \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_BUILD_TYPE=Release \
%if "%{_lib}" == "lib64" %if "%{_lib}" == "lib64"
-DLLVM_LIBDIR_SUFFIX=64 \ -DLLVM_LIBDIR_SUFFIX=64 \
%endif %endif

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:5f3fd78d8a1319694e27fdd22ad6a6e1922a07115f91c32aaec023666011031e oid sha256:49a2e6215410404a2c257ca85189fb97036531696ef39c995f067f8359767078
size 3434440 size 1440100