From ad97e3ac489cea8784cb535e6395990c0890a5ce Mon Sep 17 00:00:00 2001 From: Mahdi Mokhtari Date: Sat, 11 Aug 2018 20:22:16 +0000 Subject: databases/mysql80-{client, server}: Update ports to 8.0.12 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 Sponsored by: The FreeBSD Foundation --- databases/mysql80-client/files/patch-scripts_CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'databases/mysql80-client/files/patch-scripts_CMakeLists.txt') diff --git a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt index 3e59f3170ddd..8deeef6509d1 100644 --- a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt @@ -35,11 +35,11 @@ @@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) ++ SET(${var} "${${var}}-pthread " ) ELSE() - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) ENDIF() @@ -430,19 +436,7 @@ ELSE() # On Unix, most of the files end up in the bin directory -- cgit v1.2.3