Attachment 206201 Details for Bug 239271 – client update

[patch] client update

mysql57-client.patch (text/plain), 2.31 KB, created by Greg Veldman on 2019-08-01 15:07:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Veldman

Created: 2019-08-01 15:07:58 UTC

Size: 2.31 KB

patch

obsolete

>diff -Naur mysql57-client.orig/files/patch-scripts_CMakeLists.txt mysql57-client/files/patch-scripts_CMakeLists.txt
>--- mysql57-client.orig/files/patch-scripts_CMakeLists.txt	2016-05-06 10:39:59.000000000 -0400
>+++ mysql57-client/files/patch-scripts_CMakeLists.txt	2019-08-01 10:59:46.349581000 -0400
>@@ -1,6 +1,6 @@
>---- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
>-+++ scripts/CMakeLists.txt
>-@@ -43,6 +43,7 @@ ELSE()
>+--- scripts/CMakeLists.txt.orig	2019-06-10 10:43:20.000000000 -0400
>++++ scripts/CMakeLists.txt	2019-08-01 10:59:24.177559000 -0400
>+@@ -46,6 +46,7 @@
>    MESSAGE(FATAL_ERROR "Cannot concatenate files")
>  ENDIF()
>  
>@@ -8,7 +8,7 @@
>  # Build mysql_fix_privilege_tables.c
>  ADD_CUSTOM_COMMAND(
>    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
>-@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
>+@@ -66,6 +67,7 @@
>    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
>    ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
>  )
>@@ -16,7 +16,7 @@
>  
>  # If we do not have performance schema compiled in then sys will not work,
>  # so only create an empty sys database with an auto-generated file,
>-@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER)
>+@@ -146,6 +148,7 @@
>    )
>  ENDIF()
>  
>@@ -24,7 +24,7 @@
>  IF(UNIX)
>   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
>     "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
>-@@ -150,6 +153,7 @@ IF(UNIX)
>+@@ -153,6 +156,7 @@
>    COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
>  )
>  ENDIF()
>@@ -32,16 +32,16 @@
>  
>  IF(NOT WITHOUT_SERVER)
>    INSTALL(FILES
>-@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>+@@ -326,6 +330,8 @@
>            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()
>+@@ -411,19 +417,7 @@
>    # On Unix, most of the files end up in the bin directory
>    SET(mysql_config_COMPONENT COMPONENT Development)
>

Actions: View | Diff

Attachments on bug 239271: 206200 | 206201