61cd5f986e
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=345
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
--- 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 @@
|
|
|
|
install(TARGETS liblldb
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib)
|
|
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|