2961939ca1
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=365
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
Index: lldb/source/CMakeLists.txt
|
|
===================================================================
|
|
--- lldb/source/CMakeLists.txt
|
|
+++ lldb/source/CMakeLists.txt
|
|
@@ -342,5 +342,5 @@ endif ()
|
|
|
|
install(TARGETS liblldb
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib)
|
|
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
Index: lldb/scripts/Python/modules/readline/CMakeLists.txt
|
|
===================================================================
|
|
--- lldb/scripts/Python/modules/readline/CMakeLists.txt
|
|
+++ 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: lldb/source/lldb.cpp
|
|
===================================================================
|
|
--- lldb/source/lldb.cpp
|
|
+++ 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: lldb/source/Core/IOHandler.cpp
|
|
===================================================================
|
|
--- lldb/source/Core/IOHandler.cpp
|
|
+++ 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;
|