Skip to content
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
14 changes: 14 additions & 0 deletions ports/libmaxminddb/fix-link-thread.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index ea69ce3..94fc75a 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -13,7 +13,8 @@ if(NOT MSVC)

target_compile_definitions(mmdblookup PRIVATE PACKAGE_VERSION="${PROJECT_VERSION}")

- target_link_libraries(mmdblookup maxminddb pthread)
+ find_package(Threads)
+ target_link_libraries(mmdblookup maxminddb Threads::Threads)
Comment on lines +10 to +11
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And does the installed CMake config do find_dependency(Threads)?


if (MAXMINDDB_INSTALL)
install(
4 changes: 3 additions & 1 deletion ports/libmaxminddb/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO maxmind/libmaxminddb
REF "${VERSION}"
SHA512 b5fe1eeffca697a7163fd3e66ae489eb144f5c35e601fcd29b37ec7996f7a485da6cd06431e452050731e09e889e96bc58e32b06c40fbef30f7e79781e492d85
SHA512 681bbfd830cf7ff8f0d2945043a9da977de470e9796984d11c31c237d83b936f6f6ebd95def02869b39030d5c7d4734c3b573875ba8a924421c7d90f63ce7977
HEAD_REF main
PATCHES
fix-link-thread.patch
)

vcpkg_cmake_configure(
Expand Down
2 changes: 1 addition & 1 deletion ports/libmaxminddb/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "libmaxminddb",
"version": "1.12.2",
"version": "1.13.2",
"description": "C library for the MaxMind DB file format",
"homepage": "https://github.com/maxmind/libmaxminddb",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5141,7 +5141,7 @@
"port-version": 0
},
"libmaxminddb": {
"baseline": "1.12.2",
"baseline": "1.13.2",
"port-version": 0
},
"libmediainfo": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libmaxminddb.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "78d917b1427ce9c81d078f928c69161de4b2c84d",
"version": "1.13.2",
"port-version": 0
},
{
"git-tree": "7d86d8b0cf78e319edc3584aabaf2d896aefed59",
"version": "1.12.2",
Expand Down