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.

Sign up for GitHub

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

[bitmagic] fixed clang compilation issues #42148

Merged
merged 1 commit into from
Nov 14, 2024
Merged

[bitmagic] fixed clang compilation issues #42148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions ports/bitmagic/fix-clang.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/src/bm.h b/src/bm.h
index 547b108..0c59785 100644
--- a/src/bm.h
+++ b/src/bm.h
@@ -523,7 +523,7 @@ public:
{
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 @@ public:
{
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_;
5 changes: 3 additions & 2 deletions ports/bitmagic/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 d034f66b8631d09cb0be11b96f5f12dea416ef2cfca42ed7f0865aeb65102a4951821805ec65bee793541ce1a665e5d11ba4bedb0d79956c0eee6c856afb29b2
HEAD_REF master

PATCHES
fix-clang.patch #https://github.com/tlk00/BitMagic/commit/fab01f43eca266bf56efb1aca659773c911a83fb
)

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)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
4 changes: 3 additions & 1 deletion ports/bitmagic/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"name": "bitmagic",
"version": "7.13.4",
"port-version": 1,
"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"
"homepage": "http://bitmagic.io",
"license": "Apache-2.0"
}
5 changes: 5 additions & 0 deletions versions/b-/bitmagic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "14d510fa0efbea29992a891120f898df71dc746d",
"version": "7.13.4",
"port-version": 1
},
{
"git-tree": "98fb920eba690a2a64666a6a76e16af95a797ae8",
"version": "7.13.4",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@
},
"bitmagic": {
"baseline": "7.13.4",
"port-version": 0
"port-version": 1
},
"bitserializer": {
"baseline": "0.70",
Expand Down