|
1 === modified file 'cmake/libutils.cmake' |
|
2 --- a/cmake/libutils.cmake revid:[email protected] |
|
3 +++ b/cmake/libutils.cmake revid:[email protected] |
|
4 @@ -1,4 +1,4 @@ |
|
5 -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. |
|
6 +# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. |
|
7 # |
|
8 # This program is free software; you can redistribute it and/or modify |
|
9 # it under the terms of the GNU General Public License as published by |
|
10 @@ -158,6 +158,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NA |
|
11 IF(OSLIBS) |
|
12 LIST(REMOVE_DUPLICATES OSLIBS) |
|
13 TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS}) |
|
14 + MESSAGE(STATUS "Library ${TARGET} depends on OSLIBS ${OSLIBS}") |
|
15 ENDIF() |
|
16 |
|
17 # Make the generated dummy source file depended on all static input |
|
18 |
|
19 === modified file 'scripts/CMakeLists.txt' |
|
20 --- a/scripts/CMakeLists.txt revid:[email protected] |
|
21 +++ b/scripts/CMakeLists.txt revid:[email protected] |
|
22 @@ -229,6 +229,11 @@ |
|
23 SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) |
|
24 SET(localstatedir ${MYSQL_DATADIR}) |
|
25 |
|
26 +SET(RPATH_OPTION "") |
|
27 +IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") |
|
28 + SET(RPATH_OPTION "-R$pkglibdir") |
|
29 +ENDIF() |
|
30 + |
|
31 # some scripts use @TARGET_LINUX@ |
|
32 IF(CMAKE_SYSTEM_NAME MATCHES "Linux") |
|
33 SET(TARGET_LINUX "true") |
|
34 @@ -313,6 +318,9 @@ |
|
35 INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file}.pl COMPONENT Server_Scripts) |
|
36 ENDFOREACH() |
|
37 ELSE() |
|
38 +# Configure this one, for testing, but do not install it. |
|
39 + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in |
|
40 + ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY) |
|
41 # On Unix, most of the files end up in the bin directory |
|
42 SET(mysql_config_COMPONENT COMPONENT Development) |
|
43 SET(BIN_SCRIPTS |
|
44 |
|
45 === modified file 'scripts/mysql_config.pl.in' |
|
46 --- a/scripts/mysql_config.pl.in revid:[email protected] |
|
47 +++ b/scripts/mysql_config.pl.in revid:[email protected] |
|
48 @@ -1,7 +1,7 @@ |
|
49 #!/usr/bin/perl |
|
50 # -*- cperl -*- |
|
51 # |
|
52 -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. |
|
53 +# Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. |
|
54 # |
|
55 # This program is free software; you can redistribute it and/or modify |
|
56 # it under the terms of the GNU General Public License as published by |
|
57 @@ -189,7 +189,7 @@ if ( $^O eq "MSWin32" ) |
|
58 } |
|
59 else |
|
60 { |
|
61 - my $linkpath = "-L$pkglibdir"; |
|
62 + my $linkpath = "-L$pkglibdir @RPATH_OPTION@"; |
|
63 @lib_opts = ($linkpath,"-lmysqlclient"); |
|
64 @lib_r_opts = ($linkpath,"-lmysqlclient_r"); |
|
65 @lib_e_opts = ($linkpath,"-lmysqld"); |
|
66 |
|
67 === modified file 'scripts/mysql_config.sh' |
|
68 --- a/scripts/mysql_config.sh revid:[email protected] |
|
69 +++ b/scripts/mysql_config.sh revid:[email protected] |
|
70 @@ -1,5 +1,5 @@ |
|
71 #!/bin/sh |
|
72 -# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. |
|
73 +# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. |
|
74 # |
|
75 # This program is free software; you can redistribute it and/or modify |
|
76 # it under the terms of the GNU General Public License as published by |
|
77 @@ -110,10 +110,10 @@ |
|
78 |
|
79 # Create options |
|
80 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later |
|
81 -libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
|
82 +libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
|
83 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " |
|
84 -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " |
|
85 -embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
|
86 +libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " |
|
87 +embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " |
|
88 |
|
89 if [ -r "$pkglibdir/libmygcc.a" ]; then |
|
90 # When linking against the static library with a different version of GCC |
|
91 |