commit 77d03eb68cfb2602c5b2b8b10c214ce98648fa8a · pyrox.dev/nixpkgs

+19

pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch

···

       89
       89
        
          endif()

     

       90
       90
        
          get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)

     

       91
       91
        
          finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")

     

       92
       92
       +
       diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt

     

       93
       93
       +
       index b5633e2..86e4738 100644

     

       94
       94
       +
       --- a/source/API/CMakeLists.txt	2024-05-30 19:08:14.241656491 -0700

     

       95
       95
       +
       +++ b/source/API/CMakeLists.txt	2024-05-30 19:08:48.218219667 -0700

     

       96
       96
       +
       @@ -113,14 +113,6 @@

     

       97
       97
       +
          ${option_install_prefix}

     

       98
       98
       +
        )

     

       99
       99
       +
        

     

       100
       100
       +
       -# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so,

     

       101
       101
       +
       -# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so

     

       102
       102
       +
       -# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so

     

       103
       103
       +
       -# that _lldb.so can be loaded from Python.

     

       104
       104
       +
       -if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE)

     

       105
       105
       +
       -  set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}")

     

       106
       106
       +
       -endif()

     

       107
       107
       +
       -

     

       108
       108
       +
        if(Python3_RPATH)

     

       109
       109
       +
          set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}")

     

       110
       110
       +
          set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH   "${Python3_RPATH}")

+19

pkgs/development/compilers/llvm/13/lldb/gnu-install-dirs.patch

···

       89
       89
        
          endif()

     

       90
       90
        
          get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)

     

       91
       91
        
          finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")

     

       92
       92
       +
       diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt

     

       93
       93
       +
       index b5633e2..86e4738 100644

     

       94
       94
       +
       --- a/source/API/CMakeLists.txt	2024-05-30 21:38:39.829955586 -0700

     

       95
       95
       +
       +++ b/source/API/CMakeLists.txt	2024-05-30 21:38:48.015673758 -0700

     

       96
       96
       +
       @@ -112,14 +112,6 @@

     

       97
       97
       +
          ${option_install_prefix}

     

       98
       98
       +
        )

     

       99
       99
       +
        

     

       100
       100
       +
       -# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so,

     

       101
       101
       +
       -# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so

     

       102
       102
       +
       -# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so

     

       103
       103
       +
       -# that _lldb.so can be loaded from Python.

     

       104
       104
       +
       -if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE)

     

       105
       105
       +
       -  set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}")

     

       106
       106
       +
       -endif()

     

       107
       107
       +
       -

     

       108
       108
       +
        if(Python3_RPATH)

     

       109
       109
       +
          set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}")

     

       110
       110
       +
          set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH   "${Python3_RPATH}")

+19

pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch

···

       47
       47
        
        install(TARGETS lldbIntelFeatures

     

       48
       48
        
       -  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})

     

       49
       49
        
       +  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       50
       50
       +
       diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt

     

       51
       51
       +
       index 7d48491ec89a..c04543585588 100644

     

       52
       52
       +
       --- a/source/API/CMakeLists.txt	2024-05-30 18:59:13.449269853 -0700

     

       53
       53
       +
       +++ b/source/API/CMakeLists.txt	2024-05-30 19:00:33.721858164 -0700

     

       54
       54
       +
       @@ -115,14 +115,6 @@

     

       55
       55
       +
          ${option_install_prefix}

     

       56
       56
       +
        )

     

       57
       57
       +
        

     

       58
       58
       +
       -# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so,

     

       59
       59
       +
       -# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so

     

       60
       60
       +
       -# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so

     

       61
       61
       +
       -# that _lldb.so can be loaded from Python.

     

       62
       62
       +
       -if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE)

     

       63
       63
       +
       -  set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}")

     

       64
       64
       +
       -endif()

     

       65
       65
       +
       -

     

       66
       66
       +
        if(Python3_RPATH)

     

       67
       67
       +
          set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}")

     

       68
       68
       +
          set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH   "${Python3_RPATH}")