From ca58f9b36a02d281f4971484e38ffb557c28d093 Mon Sep 17 00:00:00 2001 From: Milot Mirdita Date: Sun, 16 Jun 2024 18:21:18 +0900 Subject: [PATCH] Rename block-aligner-c to block_aligner_c to fix rust 1.79 breaking foldseek --- CMakeLists.txt | 2 +- lib/block-aligner/c/Cargo.toml | 2 +- lib/block-aligner/c/Makefile | 2 +- lib/block-aligner/c/cbindgen.toml | 2 +- src/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0132f903..f109d21c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ corrosion_import_crate( ) include_directories(lib/block-aligner/c) if(EMSCRIPTEN) - corrosion_add_target_local_rustflags(block-aligner-c "-Clink-args=--no-entry -sRELOCATABLE=1") + corrosion_add_target_local_rustflags(block_aligner_c "-Clink-args=--no-entry -sRELOCATABLE=1") endif() set(CANDLE_FEATURE "") diff --git a/lib/block-aligner/c/Cargo.toml b/lib/block-aligner/c/Cargo.toml index 53dd259d..6b53bfcb 100644 --- a/lib/block-aligner/c/Cargo.toml +++ b/lib/block-aligner/c/Cargo.toml @@ -1,7 +1,7 @@ # Minimal Cargo.toml to avoid downloading dependencies. [package] -name = "block-aligner-c" +name = "block_aligner_c" version = "0.4.0" authors = ["c0deb0t "] edition = "2018" diff --git a/lib/block-aligner/c/Makefile b/lib/block-aligner/c/Makefile index f7a6d9d3..70440fcd 100644 --- a/lib/block-aligner/c/Makefile +++ b/lib/block-aligner/c/Makefile @@ -7,7 +7,7 @@ all: example align_prefix align_local block_aligner: cargo build --release --features simd_avx2 --offline - cbindgen --config cbindgen.toml --crate block-aligner-c --output block_aligner.h --quiet . + cbindgen --config cbindgen.toml --crate block_aligner_c --output block_aligner.h --quiet . example: block_aligner example.c $(CC) $(CFLAGS) -o example example.c diff --git a/lib/block-aligner/c/cbindgen.toml b/lib/block-aligner/c/cbindgen.toml index a5b4e8bb..1fa8471b 100644 --- a/lib/block-aligner/c/cbindgen.toml +++ b/lib/block-aligner/c/cbindgen.toml @@ -9,4 +9,4 @@ after_includes = "#define ALIGNED(n) __attribute__ ((aligned(n)))" aligned_n = "ALIGNED" [parse] -expand = ["block-aligner-c"] +expand = ["block_aligner_c"] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0f6fdd04..7ebbe3f7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,7 +13,7 @@ add_library(foldseek-framework FoldseekBase.cpp ) mmseqs_setup_derived_target(foldseek-framework) -target_link_libraries(foldseek-framework gemmiwrapper 3di pulchra kerasify tmalign block-aligner-c) +target_link_libraries(foldseek-framework gemmiwrapper 3di pulchra kerasify tmalign block_aligner_c) if(ENABLE_PROSTT5) target_link_libraries(foldseek-framework cprostt5) target_compile_definitions(foldseek-framework PUBLIC -DHAVE_PROSTT5=1)