diff options
| author | yurybura <yurybura@gmail.com> | 2020-05-13 20:26:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 10:26:05 -0700 |
| commit | 24e8be5fcfddd0da98b58a63cd918849787fb06f (patch) | |
| tree | 328e0bd25684f1392419547c1b3360e06ba5845b /ports/libmysql | |
| parent | 597038559647776ee39d02dcf159da05d9342f1d (diff) | |
| download | vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.tar.gz vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.zip | |
[boost] update to 1.73.0 (#11221)
* [boost] update to 1.73
* [ompl] remove dependency to boost-disjoint-sets
* [libtorrent] include fixes from RC_1_2 branch
* [liblas] fix boost headers
* [freeopcua] fix std headers
* [pcl] fix build with Boost 1.73.0
* [hpx] fix build with Boost 1.73.0
* [libmysql] fix conflict with C++20 header <version>
* [boost-modular-build-helper] move port-specific b2 options to the file `<port_dir>/b2-options.cmake`
[boost-python] support Python2 (fixes #3495)
* [boost-python] remove Python executable from user-config
* [libtorrent] update version after merge
* [libtorrent] add boost-variant dependency
Diffstat (limited to 'ports/libmysql')
| -rw-r--r-- | ports/libmysql/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libmysql/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/libmysql/rename-version.patch | 26 |
3 files changed, 28 insertions, 1 deletions
diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL index f3791e9d5..84dc4a974 100644 --- a/ports/libmysql/CONTROL +++ b/ports/libmysql/CONTROL @@ -1,5 +1,5 @@ Source: libmysql -Version: 8.0.4-6 +Version: 8.0.4-7 Homepage: https://github.com/mysql/mysql-server Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib Description: A MySQL client library for C development. diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 791a9c5db..bdf5a2440 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_from_github( system-libs.patch linux_libmysql.patch re2_add_compile_flags.patch + rename-version.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_65_0) diff --git a/ports/libmysql/rename-version.patch b/ports/libmysql/rename-version.patch new file mode 100644 index 000000000..155983825 --- /dev/null +++ b/ports/libmysql/rename-version.patch @@ -0,0 +1,26 @@ +diff --git a/VERSION b/VERSION.txt +similarity index 100% +rename from VERSION +rename to VERSION.txt +diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake +index bed6e9f02e2..a924ef09bac 100644 +--- a/cmake/mysql_version.cmake ++++ b/cmake/mysql_version.cmake +@@ -30,7 +30,7 @@ SET(PROTOCOL_VERSION "10") + + # Generate "something" to trigger cmake rerun when VERSION changes + CONFIGURE_FILE( +- ${CMAKE_SOURCE_DIR}/VERSION ++ ${CMAKE_SOURCE_DIR}/VERSION.txt + ${CMAKE_BINARY_DIR}/VERSION.dep + ) + +@@ -38,7 +38,7 @@ CONFIGURE_FILE( + + MACRO(MYSQL_GET_CONFIG_VALUE keyword var) + IF(NOT ${var}) +- FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=") ++ FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=") + IF(str) + STRING(REPLACE "${keyword}=" "" str ${str}) + STRING(REGEX REPLACE "[ ].*" "" str "${str}") |