mirror of
https://github.com/termux/termux-packages.git
synced 2025-10-31 11:06:05 +00:00
753f8b84b8
- Fixes https://github.com/termux/termux-packages/issues/26799 There is a new executable file, "`codelldb-launch`". I don't really understand exactly what it does yet, but codelldb was printing an error "unable to find codelldb-launch!" until I moved it out of the `.vsix` file and hardcoded the paths to it at `$TERMUX_PREFIX/bin`, just like I did for the `codelldb` executable, which still exists. After doing that, this bump is working on my device. I have also updated the comments about 32-bit exclusion to be accurate to the current situation. See here for more information about the problems with `codelldb` on 32-bit Android: https://github.com/termux/termux-packages/pull/25779#issuecomment-3213373449
59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
AllowedDependencies is only used for the testsuite
|
|
LLDB_PACKAGE is replaced with the absolute path to $TERMUX_PREFIX in lldb-paths.patch
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -19,8 +19,6 @@ message("Version ${VERSION}")
|
|
set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files")
|
|
if (LLDB_PACKAGE)
|
|
message("Using LLDB_PACKAGE=${LLDB_PACKAGE}")
|
|
-else()
|
|
- message(FATAL_ERROR "LLDB_PACKAGE not set." )
|
|
endif()
|
|
|
|
if (CMAKE_SYSROOT)
|
|
@@ -34,7 +34,17 @@ set(WithEnv ${CMAKE_COMMAND} -E env)
|
|
set(UpdateFile ${CMAKE_COMMAND} -E copy_if_different)
|
|
|
|
# General OS-specific definitions
|
|
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
|
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
|
|
+ set(Python python3)
|
|
+ set(LibPrefix lib)
|
|
+ set(LibSuffix .a)
|
|
+ set(DylibSuffix .so)
|
|
+ set(NPM npm)
|
|
+ set(PathSep ":")
|
|
+ set(DefaultTarget "${CARGO_TARGET_NAME}")
|
|
+ set(DefaultPlatformId "${VSIX_PLATFORM}")
|
|
+ set(AllowedDependencies "N/A")
|
|
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
|
set(Python python3)
|
|
set(LibPrefix lib)
|
|
set(LibSuffix .a)
|
|
@@ -108,14 +108,13 @@ endif()
|
|
|
|
# Adapter
|
|
|
|
-add_subdirectory(lldb)
|
|
add_subdirectory(bin)
|
|
add_subdirectory(adapter)
|
|
add_subdirectory(lang_support)
|
|
add_subdirectory(extension)
|
|
add_subdirectory(tests)
|
|
|
|
-add_dependencies(adapter lldb lang_support)
|
|
+add_dependencies(adapter lang_support)
|
|
|
|
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
|
configure_file(cargo_config.windows.toml ${CMAKE_BINARY_DIR}/.cargo/config.toml)
|
|
@@ -148,7 +148,7 @@ file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json ${CMAKE_CURRENT_SOU
|
|
add_custom_command(
|
|
OUTPUT ${CMAKE_BINARY_DIR}/package.json ${CMAKE_BINARY_DIR}/generated/codelldb.ts
|
|
DEPENDS ${CMAKE_SOURCE_DIR}/package.json ${CMAKE_SOURCE_DIR}/src/codelldb-types/src/lib.rs
|
|
- COMMAND cargo run --package codelldb-types -- ${CMAKE_BINARY_DIR}/codelldb.schema.json
|
|
+ COMMAND cargo run --manifest-path=${CMAKE_SOURCE_DIR}/Cargo.toml --package codelldb-types -- ${CMAKE_BINARY_DIR}/codelldb.schema.json
|
|
COMMAND ${WithEnv} NODE_PATH=${CMAKE_CURRENT_BINARY_DIR}/node_modules node ${CMAKE_CURRENT_SOURCE_DIR}/tools/prep-package.js
|
|
${CMAKE_CURRENT_BINARY_DIR}/package.pre.json ${CMAKE_CURRENT_BINARY_DIR}/package.json
|
|
COMMAND ${NPM} run json2ts -- ${CMAKE_BINARY_DIR}/codelldb.schema.json ${CMAKE_BINARY_DIR}/generated/codelldb.ts
|