Skip to content

Commit 2bdffb1

Browse files
author
Tor Didriksen
committed
Backport of Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18
Backported only the softlink part of the patch, *not* the bumping of library version. With this patch, the libmysql/ directory contains: libmysqlclient.a libmysqlclient_r.a -> libmysqlclient.a libmysqlclient_r.so -> libmysqlclient.so* libmysqlclient_r.so.18 -> libmysqlclient.so.18* libmysqlclient_r.so.18.0.0 -> libmysqlclient.so.18.0.0* libmysqlclient.so -> libmysqlclient.so.18* libmysqlclient.so.18 -> libmysqlclient.so.18.0.0* libmysqlclient.so.18.0.0*
1 parent 75c2cc4 commit 2bdffb1

File tree

3 files changed

+43
-18
lines changed

3 files changed

+43
-18
lines changed

‎cmake/install_macros.cmake‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -111,28 +111,28 @@ FUNCTION(INSTALL_SCRIPT)
111111
ENDFUNCTION()
112112

113113
# Install symbolic link to CMake target.
114-
# the link is created in the same directory as target
115-
# and extension will be the same as for target file.
116-
MACRO(INSTALL_SYMLINK linkname target destination component)
114+
# We do 'cd path; ln -s target_name link_name'
115+
# We also add an INSTALL target for "${path}/${link_name}"
116+
MACRO(INSTALL_SYMLINK target target_name link_name destination component)
117117
IF(UNIX)
118118
GET_TARGET_PROPERTY(location ${target} LOCATION)
119119
GET_FILENAME_COMPONENT(path ${location} PATH)
120-
GET_FILENAME_COMPONENT(name ${location} NAME)
121-
SET(output ${path}/${linkname})
120+
121+
SET(output ${path}/${link_name})
122122
ADD_CUSTOM_COMMAND(
123123
OUTPUT ${output}
124124
COMMAND ${CMAKE_COMMAND} ARGS -E remove -f ${output}
125125
COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink
126-
${name}
127-
${linkname}
126+
${target_name}
127+
${link_name}
128128
WORKING_DIRECTORY ${path}
129129
DEPENDS ${target}
130130
)
131131

132-
ADD_CUSTOM_TARGET(symlink_${linkname}
132+
ADD_CUSTOM_TARGET(symlink_${link_name}
133133
ALL
134134
DEPENDS ${output})
135-
SET_TARGET_PROPERTIES(symlink_${linkname} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
135+
SET_TARGET_PROPERTIES(symlink_${link_name} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
136136
IF(CMAKE_GENERATOR MATCHES "Xcode")
137137
# For Xcode, replace project config with install config
138138
STRING(REPLACE "${CMAKE_CFG_INTDIR}"

‎cmake/mysql_version.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
1818
#
1919

2020
SET(SHARED_LIB_MAJOR_VERSION "18")
21+
SET(SHARED_LIB_MINOR_VERSION "0")
2122
SET(PROTOCOL_VERSION "10")
2223
SET(DOT_FRM_VERSION "6")
2324

‎libmysql/CMakeLists.txt‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -174,6 +174,12 @@ IF(MSVC)
174174
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
175175
ENDIF()
176176

177+
MACRO(GET_TARGET_NAME target out_name)
178+
GET_TARGET_PROPERTY(location ${target} LOCATION)
179+
GET_FILENAME_COMPONENT(name ${location} NAME)
180+
SET(${out_name} ${name})
181+
ENDMACRO()
182+
177183
IF(UNIX)
178184
MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
179185
SET(DOT_VERSION ".${VERSION}")
@@ -186,19 +192,28 @@ IF(UNIX)
186192
SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
187193
ENDIF()
188194
ENDMACRO()
189-
INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
195+
ENDIF()
196+
197+
IF(UNIX)
198+
GET_TARGET_NAME(mysqlclient lib_name)
199+
INSTALL_SYMLINK(mysqlclient
200+
${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
201+
${INSTALL_LIBDIR} Development)
190202
ENDIF()
191203

192204
IF(NOT DISABLE_SHARED)
193-
MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
205+
MERGE_LIBRARIES(libmysql SHARED ${LIBS}
206+
EXPORTS ${CLIENT_API_FUNCTIONS}
207+
COMPONENT SharedLibraries)
194208
IF(UNIX)
195209
# libtool compatability
196210
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
197211
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
198212
ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
199213
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
200214
ELSE()
201-
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
215+
SET(OS_SHARED_LIB_VERSION
216+
"${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0")
202217
ENDIF()
203218
# Name of shared library is mysqlclient on Unix
204219
SET_TARGET_PROPERTIES(libmysql PROPERTIES
@@ -224,16 +239,25 @@ IF(NOT DISABLE_SHARED)
224239
"${CMAKE_SHARED_LIBRARY_SUFFIX}"
225240
""
226241
linkname)
227-
INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
228-
SET(OS_SHARED_LIB_SYMLINKS "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}")
242+
GET_TARGET_NAME(libmysql lib_name)
243+
GET_FILENAME_COMPONENT(lib_name_we ${lib_name} NAME_WE)
244+
INSTALL_SYMLINK(libmysql
245+
${lib_name} ${linkname}
246+
${INSTALL_LIBDIR} SharedLibraries)
247+
SET(OS_SHARED_LIB_SYMLINKS
248+
"${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}")
229249
LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS)
230250
FOREACH(ver ${OS_SHARED_LIB_SYMLINKS})
231251
GET_VERSIONED_LIBNAME(
232252
"${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
233253
"${CMAKE_SHARED_LIBRARY_SUFFIX}"
234254
"${ver}"
235255
linkname)
236-
INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
256+
GET_VERSIONED_LIBNAME(
257+
${lib_name_we} "${CMAKE_SHARED_LIBRARY_SUFFIX}" "${ver}" lib_name_ver)
258+
INSTALL_SYMLINK(libmysql
259+
${lib_name_ver} ${linkname}
260+
${INSTALL_LIBDIR} SharedLibraries)
237261
ENDFOREACH()
238262
ENDIF()
239263
ENDIF()

0 commit comments

Comments
 (0)