diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-05-16 07:37:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 16:37:54 -0700 |
| commit | 184c7240337b0ab5ef39176e7eb304afaf8226aa (patch) | |
| tree | 9471fb0fe8afca0823d91c9ea643ae7ccece5e11 /ports/libodb-mysql | |
| parent | 21848ba4de6735c535e9fb95f35a725f1da326dc (diff) | |
| download | vcpkg-184c7240337b0ab5ef39176e7eb304afaf8226aa.tar.gz vcpkg-184c7240337b0ab5ef39176e7eb304afaf8226aa.zip | |
[libmysql] Update to 8.0.20 (#11303)
* [libmysql] Update to 8.0.20
* Fix the redefinition'MYSQL_BIND' between libmysql and libodb-mysql
Diffstat (limited to 'ports/libodb-mysql')
| -rw-r--r-- | ports/libodb-mysql/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libodb-mysql/fix-redefinttion.patch | 32 | ||||
| -rw-r--r-- | ports/libodb-mysql/portfile.cmake | 5 |
3 files changed, 35 insertions, 4 deletions
diff --git a/ports/libodb-mysql/CONTROL b/ports/libodb-mysql/CONTROL index 53db9a2ff..e6a4e0689 100644 --- a/ports/libodb-mysql/CONTROL +++ b/ports/libodb-mysql/CONTROL @@ -1,5 +1,5 @@ Source: libodb-mysql -Version: 2.4.0-6 +Version: 2.4.0-7 Homepage: https://www.codesynthesis.com/products/odb/ Description: MySQL support for the ODB ORM library Build-Depends: libodb, libmysql diff --git a/ports/libodb-mysql/fix-redefinttion.patch b/ports/libodb-mysql/fix-redefinttion.patch new file mode 100644 index 000000000..ec6dab459 --- /dev/null +++ b/ports/libodb-mysql/fix-redefinttion.patch @@ -0,0 +1,32 @@ +diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx
+index 5396791..32a2a03 100644
+--- a/odb/mysql/mysql-types.hxx
++++ b/odb/mysql/mysql-types.hxx
+@@ -7,13 +7,24 @@
+
+ #include <odb/mysql/details/config.hxx>
+
++#include <odb/mysql/version.hxx>
++
+ typedef bool my_bool;
++
++#if !defined(LIBODB_MYSQL_MARIADB) && MYSQL_VERSION_ID >= 80011
++struct MYSQL_BIND;
++#else
+ typedef struct st_mysql_bind MYSQL_BIND;
++#endif
+
+-#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+-# include <mysql_time.h>
++#ifdef LIBODB_MYSQL_MARIADB
++# include <mysql/mysql.h>
+ #else
+-# include <mysql/mysql_time.h>
++# ifdef LIBODB_MYSQL_INCLUDE_SHORT
++# include <mysql_time.h>
++# else
++# include <mysql/mysql_time.h>
++# endif
+ #endif
+
+ #endif // ODB_MYSQL_MYSQL_TYPES_HXX
diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index 7731c167a..a52f6fc05 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "https://www.codesynthesis.com/download/odb/2.4/libodb-mysql-2.4.0.tar.gz" FILENAME "libodb-mysql-2.4.0.tar.gz" @@ -10,7 +8,8 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} OUT_SOURCE_PATH SOURCE_PATH PATCHES - ${CMAKE_CURRENT_LIST_DIR}/adapter_mysql_8.0.patch + adapter_mysql_8.0.patch + fix-redefinttion.patch ) file(COPY |