casa / casa-mp-base / caebc24d901

Commits

Herby Gillot authored and Frank Schima committed caebc24d901 26 Oct 2019

mysql8: update to 8.0.18

- add patch to fix library path for protobuf
- add zstd dependency

databases/mysql8/files/patch-cmake-install_layout.cmake.diff

Modified

--
+--- a/cmake/install_layout.cmake.orig	2016-02-08 20:35:02.000000000 -0430
--
++++ b/cmake/install_layout.cmake	2016-02-08 20:53:31.000000000 -0430
--
+@@ -82,7 +82,7 @@
-+
+--- a/cmake/install_layout.cmake        2019-10-24 09:35:40.000000000 -0500
-+
++++ b/cmake/install_layout.cmake	2019-10-24 09:40:23.000000000 -0500
-+
+@@ -85,7 +85,7 @@
-4
+ ENDIF()
--
-+
-6
+ SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
--
+-CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, SLES")
--
++CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, MACPORTS, SLES")
--
-+
+-CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX")
-+
++CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, MACPORTS")
-+
-10
+ IF(UNIX)
--
+   IF(INSTALL_LAYOUT MATCHES "RPM" OR
--
+@@ -101,7 +101,7 @@
--
+     SET(CMAKE_INSTALL_PREFIX ${default_prefix}
-+
+   IF(INSTALL_LAYOUT MATCHES "RPM")
-+
+@@ -102,7 +102,7 @@
-13
+       CACHE PATH "install prefix" FORCE)
-14
+   ENDIF()
--
+-  SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "SLES" "STANDALONE")
--
++  SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "MACPORTS" "TARGZ" "SLES" "STANDALONE")
-+
+   SET(VALID_INSTALL_LAYOUTS
-+
+-    "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "STANDALONE")
-+
++    "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "STANDALONE" "MACPORTS")
-18
+   LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
-19
+   IF(ind EQUAL -1)
-20
+     MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
--
+@@ -291,6 +291,39 @@
--
+ SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_OSX ${secure_file_priv_embedded_path})
--
--
+ #
-+
+@@ -306,6 +306,37 @@
-+
+ SET(INSTALL_MYSQLKEYRINGDIR_RPM         "/var/lib/mysql-keyring")
-+
+ SET(INSTALL_SECURE_FILE_PRIVDIR_RPM     ${secure_file_priv_path})
-+
 +
-26
++# MACPORTS layout
-27
++#
-28
++SET(INSTALL_BINDIR_MACPORTS                       "lib/@NAME@/bin")
-29
++SET(INSTALL_SBINDIR_MACPORTS                      "lib/@NAME@/bin")
-30
++SET(INSTALL_SCRIPTDIR_MACPORTS                    "lib/@NAME@/bin")
-31
++#
-32
++SET(INSTALL_LIBDIR_MACPORTS                       "lib/@NAME@/mysql")
-+
++SET(INSTALL_PRIV_LIBDIR_MACPORTS                  "lib/@NAME@/mysql")
-34
++SET(INSTALL_PLUGINDIR_MACPORTS                    "lib/@NAME@/plugin")
-35
++#
-36
++SET(INSTALL_INCLUDEDIR_MACPORTS                   "include/@NAME@/mysql")
-37
++#
-38
++SET(INSTALL_DOCDIR_MACPORTS                       "share/doc/@NAME@")
-39
++SET(INSTALL_DOCREADMEDIR_MACPORTS                 "share/doc/@NAME@")
-40
++SET(INSTALL_MANDIR_MACPORTS                       "share/man/@NAME@")
-41
++SET(INSTALL_INFODIR_MACPORTS                      "share/doc/@NAME@")
-42
++#
-43
++SET(INSTALL_SHAREDIR_MACPORTS                     "share/@NAME@")
-44
++SET(INSTALL_MYSQLSHAREDIR_MACPORTS                "share/@NAME@")
-45
++SET(INSTALL_MYSQLTESTDIR_MACPORTS                 "share/@NAME@/mysql-test")
-46
++SET(INSTALL_SQLBENCHDIR_MACPORTS                  "share/@NAME@")
-47
++SET(INSTALL_SUPPORTFILESDIR_MACPORTS              "share/@NAME@/support-files")
-48
++#
-49
++SET(INSTALL_MYSQLDATADIR_MACPORTS                 "${CMAKE_INSTALL_PREFIX}/var/db/@NAME@")
-50
++SET(INSTALL_MYSQLKEYRINGDIR_MACPORTS              "${CMAKE_INSTALL_PREFIX}/var/db/@NAME@-keyring")
-51
++SET(INSTALL_SECURE_FILE_PRIVDIR_MACPORTS          "${CMAKE_INSTALL_PREFIX}/var/db/@NAME@-files")
-52
++SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_MACPORTS "${CMAKE_INSTALL_PREFIX}/var/db/@NAME@-files")
-53
++SET(INSTALL_PLUGINTESTDIR_MACPORTS                ${plugin_tests})
--
++#
--
++# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
--
++#
--
++SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
-54
++
--
++#
--
+ # TARGZ layout
 +
-+
+ #
-+
+ # DEB layout
-58
+ #
--
+ SET(INSTALL_BINDIR_TARGZ           "bin")

casa-mp-base

Commits

Jira Issues

Add shortcut