mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 05:40:30 -04:00
aefc391f38
This update includes security fixes on issues that are mentioned on upstream critical patch report. Further info: https://www.oracle.com/technetwork/security-advisory/cpujul2019-5072835.html#AppendixMSQL Delete upstream-merged patches Change other local-patches according upstream changes PR: 239272 Reported by: Markus Kohlmeyer <rootservice@gmail.com> Sponsored by: EuroBSDCon 2019 DevSummit
31 lines
1.3 KiB
Text
31 lines
1.3 KiB
Text
--- libmysql/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC
|
|
+++ libmysql/CMakeLists.txt
|
|
@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica
|
|
ADD_SUBDIRECTORY(authentication_ldap)
|
|
|
|
# Merge several convenience libraries into one big mysqlclient
|
|
-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
|
|
+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
|
|
TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
|
|
|
|
# Visual Studio users need debug static library for debug projects
|
|
@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED)
|
|
# and link them together into shared library.
|
|
MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
|
|
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS}
|
|
- COMPONENT SharedLibraries)
|
|
+ COMPONENT SharedLibraries SKIP_INSTALL)
|
|
TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
|
|
|
|
+IF(FALSE)
|
|
IF(WIN32)
|
|
# So that libmysql_api_test below can find the .dll
|
|
ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD
|
|
@@ -338,6 +339,7 @@ ENDIF()
|
|
# to initialize api_calls[] array in api_test.c
|
|
#
|
|
SET(CLIENT_API_FUNCTION_LIST "")
|
|
+ ENDIF()
|
|
FOREACH(api ${CLIENT_API_FUNCTIONS})
|
|
SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},")
|
|
ENDFOREACH()
|