mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[libmaxminddb] Updated version to 1.9.1 (#36112)
* Updated libmaxminddb to version 1.9.1 * Cleanup portfile * Use vcpkg_install_copyright function * Updated versions * Update ci.baseline.txt * Implemented fixes from dg0yt * Versions updated * Update portfile.cmake * Update libmaxminddb.json --------- Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com>
This commit is contained in:
parent
ffa05508d1
commit
ee9c88f9ec
@ -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()
|
|
@ -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 <stdio.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
+/* libmaxminddb package version from configure */
|
|
||||||
+#define PACKAGE_VERSION "1.7.1"
|
|
||||||
+
|
|
||||||
#ifdef _WIN32
|
|
||||||
#include <winsock2.h>
|
|
||||||
#include <ws2tcpip.h>
|
|
||||||
-/* libmaxminddb package version from configure */
|
|
||||||
-#define PACKAGE_VERSION "1.7.1"
|
|
||||||
|
|
||||||
typedef ADDRESS_FAMILY sa_family_t;
|
|
||||||
|
|
@ -3,22 +3,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO maxmind/libmaxminddb
|
REPO maxmind/libmaxminddb
|
||||||
REF "${VERSION}"
|
REF "${VERSION}"
|
||||||
SHA512 0a5caa267712310ef5de4c33e008d02dff76f8a9672e370719cd1d3e0f8de1146b9120991f5c2e34ed81a4ee011510dcc4b30051f6e23a6fd0634f50d35252ec
|
SHA512 0fc69bb09b74b892317c64d11822e29311e016566b60fc217efb20aec713e29dc02400839497cfcf5e837fcee9efa3536452997fa76bbc23464fad92a5a89bef
|
||||||
HEAD_REF master
|
HEAD_REF main
|
||||||
PATCHES fix-linux-build.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH "${SOURCE_PATH}"
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
|
OPTIONS
|
||||||
|
-DBUILD_TESTING=OFF
|
||||||
|
-DCMAKE_SHARED_LIBRARY_PREFIX=lib
|
||||||
|
-DCMAKE_STATIC_LIBRARY_PREFIX=lib
|
||||||
OPTIONS_DEBUG
|
OPTIONS_DEBUG
|
||||||
-DDISABLE_INSTALL_HEADERS=ON
|
-DCMAKE_DEBUG_POSTFIX=d
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_install()
|
vcpkg_cmake_install()
|
||||||
vcpkg_copy_pdbs()
|
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
|
# Handle copyright
|
||||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||||
|
@ -1,12 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "libmaxminddb",
|
"name": "libmaxminddb",
|
||||||
"version": "1.7.1",
|
"version": "1.9.1",
|
||||||
"description": "C library for the MaxMind DB file format",
|
"description": "C library for the MaxMind DB file format",
|
||||||
"homepage": "https://github.com/maxmind/libmaxminddb",
|
"homepage": "https://github.com/maxmind/libmaxminddb",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"name": "vcpkg-cmake",
|
"name": "vcpkg-cmake",
|
||||||
"host": true
|
"host": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "vcpkg-cmake-config",
|
||||||
|
"host": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ berkeleydb:arm64-android=fail
|
|||||||
berkeleydb:x64-android=fail
|
berkeleydb:x64-android=fail
|
||||||
binlog:arm-neon-android=fail
|
binlog:arm-neon-android=fail
|
||||||
blitz:x64-android=fail
|
blitz:x64-android=fail
|
||||||
blitz:x64-linux=fail # python2
|
blitz:x64-linux=fail # python2
|
||||||
blitz:x64-osx=fail
|
blitz:x64-osx=fail
|
||||||
boinc:arm-neon-android=fail
|
boinc:arm-neon-android=fail
|
||||||
boinc:arm64-android=fail
|
boinc:arm64-android=fail
|
||||||
@ -568,6 +568,9 @@ libmariadb:x64-uwp = skip
|
|||||||
libmariadb:x64-windows = skip
|
libmariadb:x64-windows = skip
|
||||||
libmariadb:x64-windows-static = skip
|
libmariadb:x64-windows-static = skip
|
||||||
libmariadb:x64-windows-static-md=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 installs tons of problematic files that conflict with other ports (boost, eigen, etc)
|
||||||
libmesh:x64-linux=skip
|
libmesh:x64-linux=skip
|
||||||
libmikmod:arm-neon-android=fail
|
libmikmod:arm-neon-android=fail
|
||||||
|
@ -4521,7 +4521,7 @@
|
|||||||
"port-version": 3
|
"port-version": 3
|
||||||
},
|
},
|
||||||
"libmaxminddb": {
|
"libmaxminddb": {
|
||||||
"baseline": "1.7.1",
|
"baseline": "1.9.1",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libmediainfo": {
|
"libmediainfo": {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "446fd110747f3e6bc09f822e89d30f144eb52a9f",
|
||||||
|
"version": "1.9.1",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "a396718bfaa9c8e9e950cb3aaedb7bd562a157a7",
|
"git-tree": "a396718bfaa9c8e9e950cb3aaedb7bd562a157a7",
|
||||||
"version": "1.7.1",
|
"version": "1.7.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user