diff options
| author | myd7349 <myd7349@gmail.com> | 2019-05-27 19:15:06 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-05-27 19:15:06 +0800 |
| commit | 8999734b401bb8bac9fa20ce831b2ad2a9a67add (patch) | |
| tree | 3f5cf1d5abbbc4295b556ea6e27882950bdd81f3 /ports/libmariadb | |
| parent | a7ac12c90afed0a13e3b24d509927d2fca506115 (diff) | |
| parent | 9ffac4d56eed774419fbb628ea89417a6399db58 (diff) | |
| download | vcpkg-8999734b401bb8bac9fa20ce831b2ad2a9a67add.tar.gz vcpkg-8999734b401bb8bac9fa20ce831b2ad2a9a67add.zip | |
Merge branch 'master' into rdkafka-init
Diffstat (limited to 'ports/libmariadb')
| -rw-r--r-- | ports/libmariadb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libmariadb/disable-test-build.patch | 34 | ||||
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 8 |
3 files changed, 40 insertions, 4 deletions
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 0eff30a4b..147cf11a2 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,3 +1,3 @@ Source: libmariadb
-Version: 3.0.2-1
+Version: 3.0.10-1 Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
diff --git a/ports/libmariadb/disable-test-build.patch b/ports/libmariadb/disable-test-build.patch new file mode 100644 index 000000000..c877fb50b --- /dev/null +++ b/ports/libmariadb/disable-test-build.patch @@ -0,0 +1,34 @@ +diff --git a/unittest/libmariadb/CMakeLists.txt b/unittest/libmariadb/CMakeLists.txt
+index 9cea916..a39ba94 100644
+--- a/unittest/libmariadb/CMakeLists.txt
++++ b/unittest/libmariadb/CMakeLists.txt
+@@ -58,16 +58,16 @@ ENDIF()
+
+ ADD_LIBRARY(ma_getopt ma_getopt.c)
+
+-FOREACH(API_TEST ${API_TESTS})
+- IF (NOT TARGET ${API_TEST})
+- ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+- ENDIF()
+- TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
+- ADD_TEST(${API_TEST} ${EXECUTABLE_OUTPUT_PATH}/${API_TEST})
+- SET_TESTS_PROPERTIES(${API_TEST} PROPERTIES TIMEOUT 180)
+-ENDFOREACH(API_TEST)
+-
+-FOREACH(API_TEST ${MANUAL_TESTS})
+- ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+- TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
+-ENDFOREACH()
++#FOREACH(API_TEST ${API_TESTS})
++# IF (NOT TARGET ${API_TEST})
++# ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
++# ENDIF()
++# TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
++# ADD_TEST(${API_TEST} ${EXECUTABLE_OUTPUT_PATH}/${API_TEST})
++# SET_TESTS_PROPERTIES(${API_TEST} PROPERTIES TIMEOUT 180)
++#ENDFOREACH(API_TEST)
++#
++#FOREACH(API_TEST ${MANUAL_TESTS})
++# ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
++# TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
++#ENDFOREACH()
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 95b852698..0089ec0a3 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -8,10 +8,12 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MariaDB/mariadb-connector-c
- REF v3.0.2
- SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f
+ REF v3.0.10 + SHA512 43f89ead531d1b2f6ede943486bf39f606124762309c294b0f3e185937aef7439cb345103fc065e7940ed64c01ca1bf16940cd2fb0d80da60f39009c3b5a910b
HEAD_REF master
- PATCHES md.patch
+ PATCHES
+ md.patch
+ disable-test-build.patch
)
vcpkg_configure_cmake(
|