mirror of
https://git.freebsd.org/ports.git
synced 2025-07-15 08:19:13 -04:00
ad97e3ac48
This update includes Oracle Critical Patch Advisory published on July 2018 More info: http://www.oracle.com/technetwork/security-advisory/cpujul2018-4258247.html#AppendixMSQL Also: Delete upstreamed hunks of patches. Change local patches regarding upstream changes. PR: 229861 Reported by: Markus Kohlmeyer <rootservice@gmail.com> Sponsored by: The FreeBSD Foundation
32 lines
1,010 B
Text
32 lines
1,010 B
Text
--- CMakeLists.txt.orig 2018-05-03 10:27:45 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -835,6 +835,7 @@ ADD_SUBDIRECTORY(extra/regex)
|
|
ADD_SUBDIRECTORY(libmysql)
|
|
ADD_SUBDIRECTORY(libbinlogevents)
|
|
ADD_SUBDIRECTORY(libbinlogstandalone)
|
|
+ADD_SUBDIRECTORY(support-files)
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
|
|
@@ -966,12 +964,10 @@ ENDIF()
|
|
ADD_SUBDIRECTORY(packaging/WiX)
|
|
ADD_SUBDIRECTORY(packaging/solaris)
|
|
|
|
-IF(UNIX)
|
|
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
|
|
-ENDIF()
|
|
#
|
|
# RPM installs documentation directly from the source tree
|
|
#
|
|
+IF(FALSE)
|
|
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
|
|
INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
|
|
@@ -990,6 +986,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
PATTERN "README.build" EXCLUDE
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
IF(UNIX)
|
|
EXECUTE_PROCESS(
|