summaryrefslogtreecommitdiff
path: root/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
diff options
context:
space:
mode:
authorVasil Dimov <vd@FreeBSD.org>2019-07-22 15:34:37 +0000
committerVasil Dimov <vd@FreeBSD.org>2019-07-22 15:34:37 +0000
commit7277b3486dc955e267eee59e168f16cb99cb2400 (patch)
tree9b167ffc246b1e8bcf6a9c3ee6610c8e47b2259c /databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
parentUpdate to the 20180720 snapshot of GCC 9.1.1. (diff)
databases/mysqlwsrep56-server: Upgrade from 5.6.43 to 5.6.44
PR: 239373 Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Notes
Notes: svn path=/head/; revision=507145
Diffstat (limited to 'databases/mysqlwsrep56-server/files/patch-CMakeLists.txt')
-rw-r--r--databases/mysqlwsrep56-server/files/patch-CMakeLists.txt14
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 b788ad12a41c..d2bb0ab9bde7 100644
--- a/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
+++ b/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2017-01-25 07:58:07 UTC
+--- CMakeLists.txt.orig 2019-07-16 14:08:43 UTC
+++ CMakeLists.txt
-@@ -499,12 +499,10 @@ IF(UNIX)
+@@ -532,12 +532,10 @@ IF(UNIX)
ENDIF()
IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
ENDIF(WITH_EMBEDDED_SERVER)
ENDIF()
-@@ -513,10 +511,7 @@ ENDIF()
+@@ -546,10 +544,7 @@ ENDIF()
ADD_SUBDIRECTORY(scripts)
IF(NOT WITHOUT_SERVER)
@@ -24,7 +24,7 @@
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
ADD_SUBDIRECTORY(internal)
ENDIF()
-@@ -574,6 +569,7 @@ ENDIF()
+@@ -608,6 +603,7 @@ ENDIF()
#
# RPM installs documentation directly from the source tree
#
@@ -32,11 +32,11 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
-@@ -597,6 +593,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -630,6 +626,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ PATTERN "mysql.info" EXCLUDE
PATTERN "sp-imp-spec.txt" EXCLUDE
)
- ENDIF()
+ENDIF()
+ ENDIF()
INCLUDE(CPack)
-