diff options
| author | LazyWolf Lin <LazyWolfLin@gmail.com> | 2018-07-04 09:08:38 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-03 18:08:38 -0700 |
| commit | f2aaef68ae347d3fc96b834c5cdc2633fcfa7517 (patch) | |
| tree | 301da3e945dca8a6298071a7a94c009966ee0c84 | |
| parent | fe23b3017892c5af96535424a12d083ec480e622 (diff) | |
| download | vcpkg-f2aaef68ae347d3fc96b834c5cdc2633fcfa7517.tar.gz vcpkg-f2aaef68ae347d3fc96b834c5cdc2633fcfa7517.zip | |
[libodb-mysql] adapter mysql 8.0 (#3723)
* Install sodium.h
* [libodb-mysql] adapter mysql 8.0
| -rw-r--r-- | ports/libodb-mysql/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libodb-mysql/adapter_mysql_8.0.patch | 13 | ||||
| -rw-r--r-- | ports/libodb-mysql/portfile.cmake | 6 |
3 files changed, 20 insertions, 1 deletions
diff --git a/ports/libodb-mysql/CONTROL b/ports/libodb-mysql/CONTROL index d51a5a216..3a728cb58 100644 --- a/ports/libodb-mysql/CONTROL +++ b/ports/libodb-mysql/CONTROL @@ -1,4 +1,4 @@ Source: libodb-mysql -Version: 2.4.0-1 +Version: 2.4.0-2 Description: MySQL support for the ODB ORM library Build-Depends: libodb, libmysql
\ No newline at end of file diff --git a/ports/libodb-mysql/adapter_mysql_8.0.patch b/ports/libodb-mysql/adapter_mysql_8.0.patch new file mode 100644 index 000000000..9e2f23745 --- /dev/null +++ b/ports/libodb-mysql/adapter_mysql_8.0.patch @@ -0,0 +1,13 @@ +diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx +index 1254ccd..5396791 100644 +--- a/odb/mysql/mysql-types.hxx ++++ b/odb/mysql/mysql-types.hxx +@@ -7,7 +7,7 @@ + + #include <odb/mysql/details/config.hxx> + +-typedef char my_bool; ++typedef bool my_bool; + typedef struct st_mysql_bind MYSQL_BIND; + + #ifdef LIBODB_MYSQL_INCLUDE_SHORT diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index 9bb0d0434..e6f1e2441 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -19,6 +19,12 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/adapter_mysql_8.0.patch +) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib") |