aboutsummaryrefslogtreecommitdiff
path: root/ports/libmaxminddb
diff options
context:
space:
mode:
authormyd7349 <myd7349@gmail.com>2019-06-23 08:16:07 +0800
committermyd7349 <myd7349@gmail.com>2019-06-23 08:16:07 +0800
commit644851da5fbe46aadd0a8fa54e1d7d213f469fb0 (patch)
tree3f5d20aca85fcf02375cf553e893c105758a5d39 /ports/libmaxminddb
parentf1870ae02bedbaa5a501ddf3a7ba5d0a743a1053 (diff)
parentf3db66b403840b24ea2612d09cca30a5285f5ea3 (diff)
downloadvcpkg-644851da5fbe46aadd0a8fa54e1d7d213f469fb0.tar.gz
vcpkg-644851da5fbe46aadd0a8fa54e1d7d213f469fb0.zip
Merge branch 'master' into sx-init
Diffstat (limited to 'ports/libmaxminddb')
-rw-r--r--ports/libmaxminddb/CONTROL2
-rw-r--r--ports/libmaxminddb/fix-linux-build.patch19
-rw-r--r--ports/libmaxminddb/portfile.cmake1
3 files changed, 21 insertions, 1 deletions
diff --git a/ports/libmaxminddb/CONTROL b/ports/libmaxminddb/CONTROL
index a075cdb55..f8b7f85be 100644
--- a/ports/libmaxminddb/CONTROL
+++ b/ports/libmaxminddb/CONTROL
@@ -1,3 +1,3 @@
Source: libmaxminddb
-Version: 1.3.2-1
+Version: 1.3.2-2
Description: C library for the MaxMind DB file format \ No newline at end of file
diff --git a/ports/libmaxminddb/fix-linux-build.patch b/ports/libmaxminddb/fix-linux-build.patch
new file mode 100644
index 000000000..334b0f64c
--- /dev/null
+++ b/ports/libmaxminddb/fix-linux-build.patch
@@ -0,0 +1,19 @@
+diff --git a/include/maxminddb.h b/include/maxminddb.h
+index de1fdf8..1d17bc3 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.3.2"
++
+ #ifdef _WIN32
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+-/* libmaxminddb package version from configure */
+-#define PACKAGE_VERSION "1.3.2"
+
+ typedef ADDRESS_FAMILY sa_family_t;
+
diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake
index f2b17342f..bbc13472e 100644
--- a/ports/libmaxminddb/portfile.cmake
+++ b/ports/libmaxminddb/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
REF 1.3.2
SHA512 43ff5f4e3a413772cd315412afc1070fb80280405d8845dc9d94a795265a71007c6c182dc01da8e14bf7b8ab8defe05714bec543faa956e7fb0f0a7756e7df48
HEAD_REF master
+ PATCHES fix-linux-build.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})