summaryrefslogtreecommitdiff
path: root/databases/mariadb100-server/files/patch-CMakeLists.txt
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2018-02-12 18:37:26 +0000
committerBernard Spil <brnrd@FreeBSD.org>2018-02-12 18:37:26 +0000
commitd2695ce809e144aa67753158e319fb80db309a23 (patch)
treea85118d652379b2b3003fd32bc036f5bb13370b4 /databases/mariadb100-server/files/patch-CMakeLists.txt
parentUpdate to 5.5.59-38.11 (diff)
databases/mariadb100-server: Security update to 10.0.34
MFH: 2018Q1 Security: e3445736-fd01-11e7-ac58-b499baebfeaf
Diffstat (limited to 'databases/mariadb100-server/files/patch-CMakeLists.txt')
-rw-r--r--databases/mariadb100-server/files/patch-CMakeLists.txt16
1 files changed, 12 insertions, 4 deletions
diff --git a/databases/mariadb100-server/files/patch-CMakeLists.txt b/databases/mariadb100-server/files/patch-CMakeLists.txt
index b26684fa0622..124415c4f146 100644
--- a/databases/mariadb100-server/files/patch-CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-CMakeLists.txt
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig 2017-05-20 01:04:09.000000000 +0200
-+++ CMakeLists.txt 2017-05-23 20:53:22.017238000 +0200
-@@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+--- CMakeLists.txt.orig 2018-01-27 18:40:35 UTC
++++ CMakeLists.txt
+@@ -409,7 +409,6 @@ ADD_SUBDIRECTORY(sql/share)
+ ADD_SUBDIRECTORY(support-files)
+
+ IF(NOT WITHOUT_SERVER)
+- ADD_SUBDIRECTORY(tests)
+ ADD_SUBDIRECTORY(sql)
+ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
+ IF(WITH_EMBEDDED_SERVER)
+@@ -480,6 +479,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
@@ -8,7 +16,7 @@
INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
# MDEV-6526 these files are not installed anymore
-@@ -489,6 +490,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
+@@ -489,6 +489,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
ENDIF()