diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2015-08-12 13:19:36 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2015-08-12 13:19:36 +0000 |
| commit | 4af533cdd3b05dd2ffa3f86bd7fb3e3b34712ebf (patch) | |
| tree | 9eb7da1ac6becd20e72014281649419132f02d48 /databases/mariadb100-server/files/patch-CMakeLists.txt | |
| parent | Update to ocurl 0.7.5 (bugfix release) (diff) | |
databases/mariadb100-server: Update to 10.0.21
- Update to 10.0.21
- Updates mariadb100-client as well (slave-port)
- Silence portlint
- Re-roll patches with makepatch
[1] https://mariadb.atlassian.net/browse/MDEV-7398
[2] https://mariadb.atlassian.net/browse/MDEV-8128
Changes: https://mariadb.com/kb/en/mariadb/mariadb-10021-changelog/
Differential revision: https://reviews.freebsd.org/D2771
Reviewed by: koobs (mentor), vsevolod (mentor)
Approved by: vsevolod (mentor)
PR: 200097
Security: 36bd352d-299b-11e5-86ff-14dae9d210b8
MFH: 2015Q3
Diffstat (limited to 'databases/mariadb100-server/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mariadb100-server/files/patch-CMakeLists.txt | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/databases/mariadb100-server/files/patch-CMakeLists.txt b/databases/mariadb100-server/files/patch-CMakeLists.txt index f6efa9d9682a..cc24e5b85fd7 100644 --- a/databases/mariadb100-server/files/patch-CMakeLists.txt +++ b/databases/mariadb100-server/files/patch-CMakeLists.txt @@ -1,22 +1,14 @@ ---- CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 -+++ CMakeLists.txt 2014-09-05 18:22:34.646409575 +0200 -@@ -463,7 +463,6 @@ - ADD_SUBDIRECTORY(win/upgrade_wizard) - ADD_SUBDIRECTORY(win/packaging) - ENDIF() --ADD_SUBDIRECTORY(packaging/solaris) - - IF(NOT CMAKE_CROSSCOMPILING) - SET(EXPORTED comp_err comp_sql factorial gen_lex_hash) -@@ -503,6 +502,7 @@ +--- CMakeLists.txt.orig 2015-08-05 18:11:27 UTC ++++ CMakeLists.txt +@@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT COMPONENT Readme) - INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC -@@ -511,6 +511,7 @@ + +@@ -490,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() |