Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 6db2a606196fb38a6d106dc409eee1cb9a40a440 Mon Sep 17 00:00:00 2001 |
| 2 | From: Tor Didriksen <tor.didriksen@oracle.com> |
| 3 | Date: Mon, 24 Jun 2013 17:15:35 +0200 |
| 4 | Subject: [PATCH] Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18 |
| 5 | |
| 6 | With this patch, the libmysql/ directory contains: |
| 7 | libmysqlclient.a |
| 8 | libmysqlclient_r.a -> libmysqlclient.a |
| 9 | libmysqlclient_r.so -> libmysqlclient.so* |
| 10 | libmysqlclient_r.so.18 -> libmysqlclient.so.18* |
| 11 | libmysqlclient_r.so.18.1.0 -> libmysqlclient.so.18.1.0* |
| 12 | libmysqlclient.so -> libmysqlclient.so.18* |
| 13 | libmysqlclient.so.18 -> libmysqlclient.so.18.1.0* |
| 14 | libmysqlclient.so.18.1.0* |
| 15 | |
| 16 | This fixes libmysqlclient_r symlinks pointing to the unversioned |
| 17 | libmysqlclient.so symlink (leading to package QA errors since the |
| 18 | libmysqlclient-r package ends up depending on libmysqlclient-dev). |
| 19 | |
| 20 | Borrowed from MySQL 5.6 tree at https://github.com/percona/mysql/ |
| 21 | |
| 22 | Upstream-Status: Pending |
| 23 | |
| 24 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 25 | |
| 26 | --- |
| 27 | cmake/install_macros.cmake | 25 +++++++++++++++---------- |
| 28 | cmake/mysql_version.cmake | 3 ++- |
| 29 | libmysql/CMakeLists.txt | 36 ++++++++++++++++++++++++++++-------- |
| 30 | 3 files changed, 45 insertions(+), 19 deletions(-) |
| 31 | |
| 32 | diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake |
| 33 | index b8efdf8..a0d0e68 100644 |
| 34 | --- a/cmake/install_macros.cmake |
| 35 | +++ b/cmake/install_macros.cmake |
| 36 | @@ -1,4 +1,4 @@ |
| 37 | -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. |
| 38 | +# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. |
| 39 | # |
| 40 | # This program is free software; you can redistribute it and/or modify |
| 41 | # it under the terms of the GNU General Public License as published by |
| 42 | @@ -111,28 +111,33 @@ FUNCTION(INSTALL_SCRIPT) |
| 43 | ENDFUNCTION() |
| 44 | |
| 45 | # Install symbolic link to CMake target. |
| 46 | -# the link is created in the same directory as target |
| 47 | -# and extension will be the same as for target file. |
| 48 | -MACRO(INSTALL_SYMLINK linkname target destination component) |
| 49 | +# We do 'cd path; ln -s target_name link_name' |
| 50 | +# We also add an INSTALL target for "${path}/${link_name}" |
| 51 | +MACRO(INSTALL_SYMLINK target target_name link_name destination component) |
| 52 | IF(UNIX) |
| 53 | GET_TARGET_PROPERTY(location ${target} LOCATION) |
| 54 | GET_FILENAME_COMPONENT(path ${location} PATH) |
| 55 | - GET_FILENAME_COMPONENT(name ${location} NAME) |
| 56 | - SET(output ${path}/${linkname}) |
| 57 | + MESSAGE(STATUS "target ${target}") |
| 58 | + MESSAGE(STATUS "link_name ${link_name}") |
| 59 | + MESSAGE(STATUS "target_name ${target_name}") |
| 60 | + MESSAGE(STATUS "path ${path}") |
| 61 | + MESSAGE(STATUS "") |
| 62 | + |
| 63 | + SET(output ${path}/${link_name}) |
| 64 | ADD_CUSTOM_COMMAND( |
| 65 | OUTPUT ${output} |
| 66 | COMMAND ${CMAKE_COMMAND} ARGS -E remove -f ${output} |
| 67 | COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink |
| 68 | - ${name} |
| 69 | - ${linkname} |
| 70 | + ${target_name} |
| 71 | + ${link_name} |
| 72 | WORKING_DIRECTORY ${path} |
| 73 | DEPENDS ${target} |
| 74 | ) |
| 75 | |
| 76 | - ADD_CUSTOM_TARGET(symlink_${linkname} |
| 77 | + ADD_CUSTOM_TARGET(symlink_${link_name} |
| 78 | ALL |
| 79 | DEPENDS ${output}) |
| 80 | - SET_TARGET_PROPERTIES(symlink_${linkname} PROPERTIES CLEAN_DIRECT_OUTPUT 1) |
| 81 | + SET_TARGET_PROPERTIES(symlink_${link_name} PROPERTIES CLEAN_DIRECT_OUTPUT 1) |
| 82 | IF(CMAKE_GENERATOR MATCHES "Xcode") |
| 83 | # For Xcode, replace project config with install config |
| 84 | STRING(REPLACE "${CMAKE_CFG_INTDIR}" |
| 85 | diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt |
| 86 | index be5760f..96286ff 100644 |
| 87 | --- a/libmysql/CMakeLists.txt |
| 88 | +++ b/libmysql/CMakeLists.txt |
| 89 | @@ -180,6 +180,12 @@ IF(MSVC) |
| 90 | INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) |
| 91 | ENDIF() |
| 92 | |
| 93 | +MACRO(GET_TARGET_NAME target out_name) |
| 94 | + GET_TARGET_PROPERTY(location ${target} LOCATION) |
| 95 | + GET_FILENAME_COMPONENT(name ${location} NAME) |
| 96 | + SET(${out_name} ${name}) |
| 97 | +ENDMACRO() |
| 98 | + |
| 99 | IF(UNIX) |
| 100 | MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) |
| 101 | SET(DOT_VERSION ".${VERSION}") |
| 102 | @@ -192,7 +198,13 @@ IF(UNIX) |
| 103 | SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) |
| 104 | ENDIF() |
| 105 | ENDMACRO() |
| 106 | - INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) |
| 107 | +ENDIF() |
| 108 | + |
| 109 | +IF(UNIX) |
| 110 | + GET_TARGET_NAME(mysqlclient lib_name) |
| 111 | + INSTALL_SYMLINK(mysqlclient |
| 112 | + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a |
| 113 | + ${INSTALL_LIBDIR} Development) |
| 114 | ENDIF() |
| 115 | |
| 116 | IF(NOT DISABLE_SHARED) |
| 117 | @@ -205,10 +217,9 @@ IF(NOT DISABLE_SHARED) |
| 118 | # libtool compatability |
| 119 | IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) |
| 120 | SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") |
| 121 | - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") |
| 122 | - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") |
| 123 | ELSE() |
| 124 | - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0") |
| 125 | + SET(OS_SHARED_LIB_VERSION |
| 126 | + "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0") |
| 127 | ENDIF() |
| 128 | # Name of shared library is mysqlclient on Unix |
| 129 | SET_TARGET_PROPERTIES(libmysql PROPERTIES |
| 130 | @@ -239,8 +250,13 @@ IF(NOT DISABLE_SHARED) |
| 131 | "${CMAKE_SHARED_LIBRARY_SUFFIX}" |
| 132 | "" |
| 133 | linkname) |
| 134 | - INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) |
| 135 | - SET(OS_SHARED_LIB_SYMLINKS "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}") |
| 136 | + GET_TARGET_NAME(libmysql lib_name) |
| 137 | + GET_FILENAME_COMPONENT(lib_name_we ${lib_name} NAME_WE) |
| 138 | + INSTALL_SYMLINK(libmysql |
| 139 | + ${lib_name} ${linkname} |
| 140 | + ${INSTALL_LIBDIR} SharedLibraries) |
| 141 | + SET(OS_SHARED_LIB_SYMLINKS |
| 142 | + "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}") |
| 143 | LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS) |
| 144 | FOREACH(ver ${OS_SHARED_LIB_SYMLINKS}) |
| 145 | GET_VERSIONED_LIBNAME( |
| 146 | @@ -248,7 +264,11 @@ IF(NOT DISABLE_SHARED) |
| 147 | "${CMAKE_SHARED_LIBRARY_SUFFIX}" |
| 148 | "${ver}" |
| 149 | linkname) |
| 150 | - INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) |
| 151 | + GET_VERSIONED_LIBNAME( |
| 152 | + ${lib_name_we} "${CMAKE_SHARED_LIBRARY_SUFFIX}" "${ver}" lib_name_ver) |
| 153 | + INSTALL_SYMLINK(libmysql |
| 154 | + ${lib_name_ver} ${linkname} |
| 155 | + ${INSTALL_LIBDIR} SharedLibraries) |
| 156 | ENDFOREACH() |
| 157 | ENDIF() |
| 158 | ENDIF() |
| 159 | -- |
| 160 | 2.0.3 |
| 161 | |