diff --git a/ports/libmaxminddb/CMakeLists.txt b/ports/libmaxminddb/CMakeLists.txt deleted file mode 100644 index c46c6319be..0000000000 --- a/ports/libmaxminddb/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -cmake_minimum_required (VERSION 3.9) -project(maxminddb C) - -set(CMAKE_DEBUG_POSTFIX d) -set(CMAKE_SHARED_LIBRARY_PREFIX lib) -set(CMAKE_STATIC_LIBRARY_PREFIX lib) - -if(MSVC) - add_compile_options(-D_CRT_SECURE_NO_WARNINGS) -endif() - -set(SRCS - src/maxminddb.c - src/data-pool.c -) - -include_directories(. src include projects/VS12) - -add_library(maxminddb ${SRCS}) - -if(WIN32) - target_link_libraries(maxminddb ws2_32) -endif() - -install( - TARGETS maxminddb - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES include/maxminddb.h projects/VS12/maxminddb_config.h DESTINATION include/maxminddb) -endif() diff --git a/ports/libmaxminddb/fix-linux-build.patch b/ports/libmaxminddb/fix-linux-build.patch deleted file mode 100644 index db35979e63..0000000000 --- a/ports/libmaxminddb/fix-linux-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/include/maxminddb.h b/include/maxminddb.h -index 4002ec6..65482c5 100644 ---- a/include/maxminddb.h -+++ b/include/maxminddb.h -@@ -24,11 +24,12 @@ extern "C" { - #include - #include - -+/* libmaxminddb package version from configure */ -+#define PACKAGE_VERSION "1.7.1" -+ - #ifdef _WIN32 - #include - #include --/* libmaxminddb package version from configure */ --#define PACKAGE_VERSION "1.7.1" - - typedef ADDRESS_FAMILY sa_family_t; - diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index 70a393c399..f58b4cee7e 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -3,22 +3,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO maxmind/libmaxminddb - REF "${VERSION}" - SHA512 0a5caa267712310ef5de4c33e008d02dff76f8a9672e370719cd1d3e0f8de1146b9120991f5c2e34ed81a4ee011510dcc4b30051f6e23a6fd0634f50d35252ec - HEAD_REF master - PATCHES fix-linux-build.patch + REF "${VERSION}" + SHA512 0fc69bb09b74b892317c64d11822e29311e016566b60fc217efb20aec713e29dc02400839497cfcf5e837fcee9efa3536452997fa76bbc23464fad92a5a89bef + HEAD_REF main ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_SHARED_LIBRARY_PREFIX=lib + -DCMAKE_STATIC_LIBRARY_PREFIX=lib OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + -DCMAKE_DEBUG_POSTFIX=d ) - vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/maxminddb PACKAGE_NAME maxminddb) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libmaxminddb/vcpkg.json b/ports/libmaxminddb/vcpkg.json index 9fdd6d252a..07fafac385 100644 --- a/ports/libmaxminddb/vcpkg.json +++ b/ports/libmaxminddb/vcpkg.json @@ -1,12 +1,16 @@ { "name": "libmaxminddb", - "version": "1.7.1", + "version": "1.9.1", "description": "C library for the MaxMind DB file format", "homepage": "https://github.com/maxmind/libmaxminddb", "dependencies": [ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1c34876165..72f313250a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -75,7 +75,7 @@ berkeleydb:arm64-android=fail berkeleydb:x64-android=fail binlog:arm-neon-android=fail blitz:x64-android=fail -blitz:x64-linux=fail # python2 +blitz:x64-linux=fail # python2 blitz:x64-osx=fail boinc:arm-neon-android=fail boinc:arm64-android=fail @@ -568,6 +568,9 @@ libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x64-windows-static-md=skip +libmaxminddb:arm64-android=fail +libmaxminddb:arm-neon-android=fail +libmaxminddb:x64-android=fail # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) libmesh:x64-linux=skip libmikmod:arm-neon-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 86b614e73d..4beb07359d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4521,7 +4521,7 @@ "port-version": 3 }, "libmaxminddb": { - "baseline": "1.7.1", + "baseline": "1.9.1", "port-version": 0 }, "libmediainfo": { diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index da9a71ac9b..992f08d71a 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "446fd110747f3e6bc09f822e89d30f144eb52a9f", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "a396718bfaa9c8e9e950cb3aaedb7bd562a157a7", "version": "1.7.1",