mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 17:41:09 +08:00
[bitmagic] fixed clang compilation issues (#42148)
This commit is contained in:
parent
772f784ba8
commit
831e6fde42
22
ports/bitmagic/fix-clang.patch
Normal file
22
ports/bitmagic/fix-clang.patch
Normal file
@ -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,9 +5,10 @@ vcpkg_from_github(
|
|||||||
REF "v${VERSION}"
|
REF "v${VERSION}"
|
||||||
SHA512 d034f66b8631d09cb0be11b96f5f12dea416ef2cfca42ed7f0865aeb65102a4951821805ec65bee793541ce1a665e5d11ba4bedb0d79956c0eee6c856afb29b2
|
SHA512 d034f66b8631d09cb0be11b96f5f12dea416ef2cfca42ed7f0865aeb65102a4951821805ec65bee793541ce1a665e5d11ba4bedb0d79956c0eee6c856afb29b2
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
|
PATCHES
|
||||||
|
fix-clang.patch #https://github.com/tlk00/BitMagic/commit/fab01f43eca266bf56efb1aca659773c911a83fb
|
||||||
)
|
)
|
||||||
|
|
||||||
file(GLOB HEADER_LIST "${SOURCE_PATH}/src/*.h")
|
file(GLOB HEADER_LIST "${SOURCE_PATH}/src/*.h")
|
||||||
file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
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")
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
{
|
{
|
||||||
"name": "bitmagic",
|
"name": "bitmagic",
|
||||||
"version": "7.13.4",
|
"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.",
|
"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"
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "14d510fa0efbea29992a891120f898df71dc746d",
|
||||||
|
"version": "7.13.4",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "98fb920eba690a2a64666a6a76e16af95a797ae8",
|
"git-tree": "98fb920eba690a2a64666a6a76e16af95a797ae8",
|
||||||
"version": "7.13.4",
|
"version": "7.13.4",
|
||||||
|
@ -662,7 +662,7 @@
|
|||||||
},
|
},
|
||||||
"bitmagic": {
|
"bitmagic": {
|
||||||
"baseline": "7.13.4",
|
"baseline": "7.13.4",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"bitserializer": {
|
"bitserializer": {
|
||||||
"baseline": "0.70",
|
"baseline": "0.70",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user