Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add custom overlay fixing clang builds for bitmagic #1975

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions cpp/third_party/vcpkg_overlays/bitmagic/fix-clang.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From fab01f43eca266bf56efb1aca659773c911a83fb Mon Sep 17 00:00:00 2001
From: Anatoliy Kuznetsov <[email protected]>
Date: Tue, 3 Sep 2024 15:29:08 -0400
Subject: [PATCH] fixed clang compilation issues

---
src/bm.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bm.h b/src/bm.h
index 70996e53..05bb139c 100644
--- a/src/bm.h
+++ b/src/bm.h
@@ -523,7 +523,7 @@ class bvector
{
bvect_ = ii.bvect_;
if (!buf_)
- buf_ = bvect_->allocate_tempblock();
+ buf_ = (value_type*) bvect_->blockman_.get_allocator().alloc_bit_block();
buf_size_ = ii.buf_size_;
::memcpy(buf_, ii.buf_, buf_size_ * sizeof(*buf_));
sorted_ = ii.sorted_;
@@ -534,7 +534,7 @@ class bvector
{
bvect_ = ii.bvect_;
if (buf_)
- bvect_->free_tempblock(buf_);
+ bvect_->blockman_.get_allocator().free_bit_block((bm::word_t*)buf_);
buf_ = ii.buf_; ii.buf_ = 0;
buf_size_ = ii.buf_size_;
sorted_ = ii.sorted_;

15 changes: 15 additions & 0 deletions cpp/third_party/vcpkg_overlays/bitmagic/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Header-only library
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tlk00/BitMagic
REF "v${VERSION}"
SHA512 d034f66b8631d09cb0be11b96f5f12dea416ef2cfca42ed7f0865aeb65102a4951821805ec65bee793541ce1a665e5d11ba4bedb0d79956c0eee6c856afb29b2
HEAD_REF master
PATCHES
fix-clang.patch

)

file(GLOB HEADER_LIST "${SOURCE_PATH}/src/*.h")
file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
6 changes: 6 additions & 0 deletions cpp/third_party/vcpkg_overlays/bitmagic/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "bitmagic",
"version": "7.13.4",
"description": "Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing.",
"homepage": "http://bitmagic.io"
}
Loading