pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #207863 from patryk4815/fix-lldb

lldb_14: fix broken python3 site-packages and lua5_3

authored by 7c6f434c and committed by GitHub 01b91d15 e1a454d6

+60 -4
unified split
+3
pkgs/development/compilers/llvm/10/lldb/default.nix
··· 69 70 doCheck = false; 71 72 installCheckPhase = '' 73 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 74 return 1; 75 fi 76 '';
··· 69 70 doCheck = false; 71 72 + doInstallCheck = true; 73 + 74 installCheckPhase = '' 75 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 76 + echo "ERROR: python files not installed where expected!"; 77 return 1; 78 fi 79 '';
+3
pkgs/development/compilers/llvm/11/lldb/default.nix
··· 69 70 doCheck = false; 71 72 installCheckPhase = '' 73 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 74 return 1; 75 fi 76 '';
··· 69 70 doCheck = false; 71 72 + doInstallCheck = true; 73 + 74 installCheckPhase = '' 75 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 76 + echo "ERROR: python files not installed where expected!"; 77 return 1; 78 fi 79 '';
+3
pkgs/development/compilers/llvm/12/lldb/default.nix
··· 85 86 doCheck = false; 87 88 installCheckPhase = '' 89 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 90 return 1; 91 fi 92 '';
··· 85 86 doCheck = false; 87 88 + doInstallCheck = true; 89 + 90 installCheckPhase = '' 91 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 92 + echo "ERROR: python files not installed where expected!"; 93 return 1; 94 fi 95 '';
+3
pkgs/development/compilers/llvm/13/lldb/default.nix
··· 101 102 doCheck = false; 103 104 installCheckPhase = '' 105 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 106 return 1; 107 fi 108 '';
··· 101 102 doCheck = false; 103 104 + doInstallCheck = true; 105 + 106 installCheckPhase = '' 107 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 108 + echo "ERROR: python files not installed where expected!"; 109 return 1; 110 fi 111 '';
+8 -1
pkgs/development/compilers/llvm/14/lldb/default.nix
··· 106 107 doCheck = false; 108 109 installCheckPhase = '' 110 - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 111 return 1; 112 fi 113 '';
··· 106 107 doCheck = false; 108 109 + doInstallCheck = true; 110 + 111 installCheckPhase = '' 112 + if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then 113 + echo "ERROR: python files not installed where expected!"; 114 + return 1; 115 + fi 116 + if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then 117 + echo "ERROR: lua files not installed where expected!"; 118 return 1; 119 fi 120 '';
+34 -3
pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch
··· 2 index 79d451965ed4..78188978d6de 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 - @@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH 6 # If we are not building as part of LLVM, build LLDB as a standalone project, 7 # using LLVM as an external library. 8 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) 9 + include(GNUInstallDirs) 10 + 11 project(lldb) 12 - include(LLDBStandalone) 13 - 14 diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake 15 index 3291a7c808e1..b27d27ce6a87 100644 16 --- a/cmake/modules/AddLLDB.cmake ··· 34 install(TARGETS lldbIntelFeatures 35 - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 36 + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
··· 2 index 79d451965ed4..78188978d6de 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 + @@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH 6 # If we are not building as part of LLVM, build LLDB as a standalone project, 7 # using LLVM as an external library. 8 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) 9 + include(GNUInstallDirs) 10 + 11 project(lldb) 12 + set(LLDB_BUILT_STANDALONE TRUE) 13 + endif() 14 + @@ -108,7 +110,7 @@ if (LLDB_ENABLE_PYTHON) 15 + if(LLDB_BUILD_FRAMEWORK) 16 + set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") 17 + else() 18 + - set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") 19 + + set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") 20 + endif() 21 + get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) 22 + finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") 23 + @@ -118,7 +120,7 @@ if (LLDB_ENABLE_LUA) 24 + if(LLDB_BUILD_FRAMEWORK) 25 + set(lldb_lua_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Lua") 26 + else() 27 + - set(lldb_lua_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_LUA_RELATIVE_PATH}") 28 + + set(lldb_lua_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH}") 29 + endif() 30 + get_target_property(lldb_lua_bindings_dir swig_wrapper_lua BINARY_DIR) 31 + finish_swig_lua("lldb-lua" "${lldb_lua_bindings_dir}" "${lldb_lua_target_dir}") 32 diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake 33 index 3291a7c808e1..b27d27ce6a87 100644 34 --- a/cmake/modules/AddLLDB.cmake ··· 52 install(TARGETS lldbIntelFeatures 53 - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 54 + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) 55 + diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake 56 + index 7d48491ec89a..c04543585588 100644 57 + --- a/cmake/modules/LLDBStandalone.cmake 58 + +++ b/cmake/modules/LLDBStandalone.cmake 59 + @@ -70,7 +70,7 @@ endif() 60 + 61 + # They are used as destination of target generators. 62 + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) 63 + -set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) 64 + +set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) 65 + if(WIN32 OR CYGWIN) 66 + # DLL platform -- put DLLs into bin. 67 + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
+3
pkgs/development/compilers/llvm/8/lldb/default.nix
··· 75 76 doCheck = false; 77 78 installCheckPhase = '' 79 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 80 return 1; 81 fi 82 '';
··· 75 76 doCheck = false; 77 78 + doInstallCheck = true; 79 + 80 installCheckPhase = '' 81 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 82 + echo "ERROR: python files not installed where expected!"; 83 return 1; 84 fi 85 '';
+3
pkgs/development/compilers/llvm/9/lldb/default.nix
··· 80 81 doCheck = false; 82 83 installCheckPhase = '' 84 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 85 return 1; 86 fi 87 '';
··· 80 81 doCheck = false; 82 83 + doInstallCheck = true; 84 + 85 installCheckPhase = '' 86 if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 87 + echo "ERROR: python files not installed where expected!"; 88 return 1; 89 fi 90 '';