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

- Update to llvm 3.5.0

Browse Source 
* Major update, see http://llvm.org/releases/3.5.0/docs/ReleaseNotes.html
- Use upstream pristine tarballs
- Add libc++/libc++abi support clang
- Add libcxxabi-exceptions.patch to fix libcxxabi exception handling 
- Remove asan-disable-hugemalloctest.patch and 
  cmake-patchversion.patch, fixed upstream.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=364
This commit is contained in:
Ismail Dönmez
2014-09-04 16:28:42 +00:00
committed by Git OBS Bridge
parent a8c461b589
commit 22d6607fca
25 changed files with 200 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
lldb-cmake.patch
View File

@@ -1,43 +1,8 @@
--- lldb.orig/scripts/CMakeLists.txt 2013-06-13 09:05:41.000000000 -0700
+++ lldb.orig/scripts/CMakeLists.txt 2014-03-08 00:59:09.089734896 -0800
@@ -16,5 +16,16 @@
# Install the LLDB python module on all operating systems (except Windows)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
- install(SCRIPT lldb_python_module.cmake -DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" -DCMAKE_BUILD_DIR=\"${CMAKE_BUILD_DIR}\")
+ install(CODE "
+ include(FindPythonInterp)
+
+ SET(PYTHON_DIRECTORY python\${PYTHON_VERSION_MAJOR}.\${PYTHON_VERSION_MINOR})
+
+ SET(lldb_module_src ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/\${PYTHON_DIRECTORY})
+ SET(lldb_module_dest \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX})
+
+ MESSAGE(STATUS \"Installing LLDB python module from: \${lldb_module_src} to \${lldb_module_dest}\")
+ FILE(COPY \${lldb_module_src} DESTINATION \${lldb_module_dest})
+ "
+ )
endif()
--- lldb.orig/scripts/lldb_python_module.cmake 2013-06-13 09:05:41.000000000 -0700
+++ /dev/null 2014-02-14 05:57:02.719999980 -0800
@@ -1,14 +0,0 @@
-# This CMake script installs the LLDB python module from the build directory
-# to the install directory.
-
-# FIXME: if a non-standard version of python is requested, the cmake macro
-# below will need Python_ADDITIONAL_VERSIONS set in order to find it.
-include(FindPythonInterp)
-
-SET(PYTHON_DIRECTORY python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-
-SET(lldb_module_src ${CMAKE_CURRENT_BINARY_DIR}/lib/${PYTHON_DIRECTORY})
-SET(lldb_module_dest ${CMAKE_INSTALL_PREFIX}/lib)
-
-MESSAGE(STATUS "Installing LLDB python module from: ${lldb_module_src} to ${lldb_module_dest}")
-FILE(COPY "${lldb_module_src}" DESTINATION "${lldb_module_dest}")
--- lldb.orig/source/CMakeLists.txt 2013-11-15 06:15:10.000000000 -0800
+++ lldb/source/CMakeLists.txt 2014-03-08 03:38:38.480795021 -0800
@@ -225,5 +225,5 @@
Index: llvm/tools/lldb/source/CMakeLists.txt
===================================================================
--- llvm.orig/tools/lldb/source/CMakeLists.txt
+++ llvm/tools/lldb/source/CMakeLists.txt
@@ -342,5 +342,5 @@ endif ()
install(TARGETS liblldb
RUNTIME DESTINATION bin
@@ -45,3 +10,48 @@
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
Index: llvm/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt
===================================================================
--- llvm.orig/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt
+++ llvm/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(readline SHARED readline.cpp
# python finds it when loading the python readline module.
set_target_properties(readline PROPERTIES
PREFIX ""
- LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib/${PYTHON_DIRECTORY})
+ LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/${PYTHON_DIRECTORY})
# Install the readline module.
-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})
Index: llvm/tools/lldb/source/lldb.cpp
===================================================================
--- llvm.orig/tools/lldb/source/lldb.cpp
+++ llvm/tools/lldb/source/lldb.cpp
@@ -287,11 +287,7 @@ extern "C" const unsigned char liblldb_c
static const char *
GetLLDBRevision()
{
-#ifdef LLDB_REVISION
return LLDB_REVISION;
-#else
- return NULL;
-#endif
}
static const char *
Index: llvm/tools/lldb/source/Core/IOHandler.cpp
===================================================================
--- llvm.orig/tools/lldb/source/Core/IOHandler.cpp
+++ llvm/tools/lldb/source/Core/IOHandler.cpp
@@ -29,8 +29,8 @@
#include "lldb/Target/ThreadPlan.h"
#ifndef LLDB_DISABLE_CURSES
-#include <ncurses.h>
-#include <panel.h>
+#include <ncurses/ncurses.h>
+#include <ncurses/panel.h>
#endif
using namespace lldb;