rpm/llvm
SHA256
1
0
Fork 0
forked from pool/llvm
Code Pull Requests Activity

Fixup lldb

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=365
This commit is contained in:
Ismail Dönmez 2014-09-04 16:35:33 +00:00 committed by Git OBS Bridge
parent 22d6607fca
commit 2961939ca1
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lldb-cmake.patch
View File

@ -1,7 +1,7 @@
Index: llvm/tools/lldb/source/CMakeLists.txt Index: lldb/source/CMakeLists.txt
=================================================================== ===================================================================
--- llvm.orig/tools/lldb/source/CMakeLists.txt --- lldb/source/CMakeLists.txt
+++ llvm/tools/lldb/source/CMakeLists.txt +++ lldb/source/CMakeLists.txt
@@ -342,5 +342,5 @@ endif () @@ -342,5 +342,5 @@ endif ()
install(TARGETS liblldb install(TARGETS liblldb
@ -10,10 +10,10 @@ Index: llvm/tools/lldb/source/CMakeLists.txt
- ARCHIVE DESTINATION lib) - ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} + LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
Index: llvm/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt Index: lldb/scripts/Python/modules/readline/CMakeLists.txt
=================================================================== ===================================================================
--- llvm.orig/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt --- lldb/scripts/Python/modules/readline/CMakeLists.txt
+++ llvm/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt +++ lldb/scripts/Python/modules/readline/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(readline SHARED readline.cpp @@ -13,7 +13,7 @@ add_library(readline SHARED readline.cpp
# python finds it when loading the python readline module. # python finds it when loading the python readline module.
set_target_properties(readline PROPERTIES set_target_properties(readline PROPERTIES
@ -24,10 +24,10 @@ Index: llvm/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt
# Install the readline module. # Install the readline module.
-install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON_DIRECTORY}) -install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON_DIRECTORY})
+install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/${PYTHON_DIRECTORY}) +install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/${PYTHON_DIRECTORY})
Index: llvm/tools/lldb/source/lldb.cpp Index: lldb/source/lldb.cpp
=================================================================== ===================================================================
--- llvm.orig/tools/lldb/source/lldb.cpp --- lldb/source/lldb.cpp
+++ llvm/tools/lldb/source/lldb.cpp +++ lldb/source/lldb.cpp
@@ -287,11 +287,7 @@ extern "C" const unsigned char liblldb_c @@ -287,11 +287,7 @@ extern "C" const unsigned char liblldb_c
static const char * static const char *
GetLLDBRevision() GetLLDBRevision()
@ -40,10 +40,10 @@ Index: llvm/tools/lldb/source/lldb.cpp
} }
static const char * static const char *
Index: llvm/tools/lldb/source/Core/IOHandler.cpp Index: lldb/source/Core/IOHandler.cpp
=================================================================== ===================================================================
--- llvm.orig/tools/lldb/source/Core/IOHandler.cpp --- lldb/source/Core/IOHandler.cpp
+++ llvm/tools/lldb/source/Core/IOHandler.cpp +++ lldb/source/Core/IOHandler.cpp
@@ -29,8 +29,8 @@ @@ -29,8 +29,8 @@
#include "lldb/Target/ThreadPlan.h" #include "lldb/Target/ThreadPlan.h"

6
lldb.spec
View File

@ -27,8 +27,8 @@ Source: http://llvm.org/releases/%{version}/lldb-%{version}.src.tar.xz
Patch1: lldb-cmake.patch Patch1: lldb-cmake.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libedit-devel BuildRequires: libedit-devel
BuildRequires: llvm-clang-devel BuildRequires: llvm-clang-devel = %{version}
BuildRequires: llvm-devel BuildRequires: llvm-devel = %{version}
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: swig BuildRequires: swig
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -56,7 +56,7 @@ larger LLVM Project, such as the Clang expression parser and LLVM
disassembler. disassembler.
%prep %prep
%setup -q %setup -q -n %{name}-%{version}.src
%patch1 -p1 %patch1 -p1
%build %build