From 80d77c3d048350b8ca69e7a5da856d7a3871b547 Mon Sep 17 00:00:00 2001 From: psondej Date: Mon, 26 Dec 2022 19:54:07 +0100 Subject: llvmPackages_8.lldb: enable installCheckPhase, add message --- pkgs/development/compilers/llvm/8/lldb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/8/lldb/default.nix b/pkgs/development/compilers/llvm/8/lldb/default.nix index f6d77d0b00f..eb5f5b9e368 100644 --- a/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/pkgs/development/compilers/llvm/8/lldb/default.nix @@ -62,8 +62,11 @@ stdenv.mkDerivation rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; -- cgit 1.4.1 From 0a968846e1db86e27a04a0f80df4b91622e98044 Mon Sep 17 00:00:00 2001 From: psondej Date: Mon, 26 Dec 2022 19:54:20 +0100 Subject: llvmPackages_9.lldb: enable installCheckPhase, add message --- pkgs/development/compilers/llvm/9/lldb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/9/lldb/default.nix b/pkgs/development/compilers/llvm/9/lldb/default.nix index 644911b905c..ef3324c5b45 100644 --- a/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/pkgs/development/compilers/llvm/9/lldb/default.nix @@ -59,8 +59,11 @@ stdenv.mkDerivation rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; -- cgit 1.4.1 From 44554bd94134bab63734ecbf44e3b355f1d2dc3d Mon Sep 17 00:00:00 2001 From: psondej Date: Mon, 26 Dec 2022 19:54:32 +0100 Subject: llvmPackages_10.lldb: enable installCheckPhase, add message --- pkgs/development/compilers/llvm/10/lldb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/10/lldb/default.nix b/pkgs/development/compilers/llvm/10/lldb/default.nix index c1be5230e22..4a40a931af6 100644 --- a/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/pkgs/development/compilers/llvm/10/lldb/default.nix @@ -69,8 +69,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; -- cgit 1.4.1 From e4d24b7187f61b6de8ffcf4f2b2a1304df36b108 Mon Sep 17 00:00:00 2001 From: psondej Date: Mon, 26 Dec 2022 19:54:46 +0100 Subject: llvmPackages_11.lldb: enable installCheckPhase, add message --- pkgs/development/compilers/llvm/11/lldb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/11/lldb/default.nix b/pkgs/development/compilers/llvm/11/lldb/default.nix index 46d6c6628e1..5912323608d 100644 --- a/pkgs/development/compilers/llvm/11/lldb/default.nix +++ b/pkgs/development/compilers/llvm/11/lldb/default.nix @@ -69,8 +69,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; -- cgit 1.4.1 From 6346b158ec599ce1b59bc5de9b616499f35abde7 Mon Sep 17 00:00:00 2001 From: psondej Date: Mon, 26 Dec 2022 19:54:55 +0100 Subject: llvmPackages_12.lldb: enable installCheckPhase, add message --- pkgs/development/compilers/llvm/12/lldb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index b6659034e81..c75eb255cd7 100644 --- a/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -85,8 +85,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; -- cgit 1.4.1 From 4ac8aa736e0175b0a847d9c15550eeb188b35325 Mon Sep 17 00:00:00 2001 From: psondej Date: Mon, 26 Dec 2022 19:55:02 +0100 Subject: llvmPackages_13.lldb: enable installCheckPhase, add message --- pkgs/development/compilers/llvm/13/lldb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/13/lldb/default.nix b/pkgs/development/compilers/llvm/13/lldb/default.nix index d040e2b3975..ca7a17a5e90 100644 --- a/pkgs/development/compilers/llvm/13/lldb/default.nix +++ b/pkgs/development/compilers/llvm/13/lldb/default.nix @@ -101,8 +101,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; -- cgit 1.4.1 From ebf3779600859c4154bfd451154bcaa101b88cfd Mon Sep 17 00:00:00 2001 From: psondej Date: Mon, 26 Dec 2022 21:50:58 +0100 Subject: llvmPackages_14.lldb: enable installCheckPhase, add message --- pkgs/development/compilers/llvm/14/lldb/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/14/lldb/default.nix b/pkgs/development/compilers/llvm/14/lldb/default.nix index 2493dcde0c8..cd28325a557 100644 --- a/pkgs/development/compilers/llvm/14/lldb/default.nix +++ b/pkgs/development/compilers/llvm/14/lldb/default.nix @@ -106,8 +106,15 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then + echo "ERROR: python files not installed where expected!"; + return 1; + fi + if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then + echo "ERROR: lua files not installed where expected!"; return 1; fi ''; -- cgit 1.4.1 From 74616a18ab828ff01ff9c9b050974ffaa8b98862 Mon Sep 17 00:00:00 2001 From: psondej Date: Mon, 26 Dec 2022 21:51:27 +0100 Subject: llvmPackages_14.lldb: fix broken lua and python3 site-packages install dir --- .../compilers/llvm/14/lldb/gnu-install-dirs.patch | 37 ++++++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch index f69ed9e162f..f2a3b27296c 100644 --- a/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch @@ -2,15 +2,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 79d451965ed4..78188978d6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH +@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH # If we are not building as part of LLVM, build LLDB as a standalone project, # using LLVM as an external library. if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + include(GNUInstallDirs) + project(lldb) - include(LLDBStandalone) - + set(LLDB_BUILT_STANDALONE TRUE) + endif() +@@ -108,7 +110,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") + else() +- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") ++ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") + endif() + get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) + finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") +@@ -118,7 +120,7 @@ if (LLDB_ENABLE_LUA) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_lua_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Lua") + else() +- set(lldb_lua_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_LUA_RELATIVE_PATH}") ++ set(lldb_lua_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH}") + endif() + get_target_property(lldb_lua_bindings_dir swig_wrapper_lua BINARY_DIR) + finish_swig_lua("lldb-lua" "${lldb_lua_bindings_dir}" "${lldb_lua_target_dir}") diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake index 3291a7c808e1..b27d27ce6a87 100644 --- a/cmake/modules/AddLLDB.cmake @@ -34,3 +52,16 @@ index 7d48491ec89a..c04543585588 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 7d48491ec89a..c04543585588 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -70,7 +70,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file -- cgit 1.4.1