diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2019-11-02 15:18:26 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2019-11-02 15:18:26 +0000 |
| commit | f183749b1c71c5f1c3763b3d2b2f11a497b11f5f (patch) | |
| tree | 69fddc35094cc12931115080d9bc9fb7de897268 /databases/mysqlwsrep56-server/files/patch-CMakeLists.txt | |
| parent | Update patches imported from asterisk project to latest version. (diff) | |
databases/mysqlwsrep56-server: upgrade 5.6.45-25.27 -> 5.6.46-25.28
PR: 241533
Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Relnotes: http://releases.galeracluster.com/mysql-wsrep-5.6.46-25.28/release-notes-mysql-wsrep-5.6.46-25.28.txt
Notes
Notes:
svn path=/head/; revision=516331
Diffstat (limited to 'databases/mysqlwsrep56-server/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mysqlwsrep56-server/files/patch-CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt index d2bb0ab9bde7..673eaff31676 100644 --- a/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt +++ b/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-07-16 14:08:43 UTC +--- CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ CMakeLists.txt -@@ -532,12 +532,10 @@ IF(UNIX) +@@ -568,12 +568,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) @@ -13,7 +13,7 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -546,10 +544,7 @@ ENDIF() +@@ -582,10 +580,7 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) @@ -24,15 +24,15 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -608,6 +603,7 @@ ENDIF() +@@ -644,6 +639,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -630,6 +626,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + INSTALL(FILES + README +@@ -664,6 +660,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE ) |