maria-developers team mailing list archive

[Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>]

Oleksandr Byelkin <sanja@xxxxxxxxxxxx> writes:

> At file:///Users/bell/maria/bzr/work-maria-5.3-machandlersocket/
>
> ------------------------------------------------------------
> revno: 2988
> revision-id: sanja@xxxxxxxxxxxx-20110513135817-kspibqh2830aj5tk
> parent: sanja@xxxxxxxxxxxx-20110512150136-5yzagaev1ssohykp
> committer: Oleksandr Byelkin <sanja@xxxxxxxxxxxx>
> branch nick: work-maria-5.3-machandlersocket
> timestamp: Fri 2011-05-13 16:58:17 +0300
> message:
>   Added directories with .dylib files to DYLD_LYBRARY_PATH to allow plugin to use them.
> === modified file 'mysql-test/mysql-test-run.pl'
> --- a/mysql-test/mysql-test-run.pl	2011-04-19 12:34:40 +0000
> +++ b/mysql-test/mysql-test-run.pl	2011-05-13 13:58:17 +0000
> @@ -2051,6 +2051,16 @@
>        push(@ld_library_paths, "$basedir/libmysql/.libs/",
>  	   "$basedir/libmysql_r/.libs/",
>  	   "$basedir/zlib/.libs/");
> +      if ($^O eq "darwin")
> +      {
> +        my %dirs= ();
> +        # it is MAC OS and we have to add dynamic libraries paths
> +        for (<$bindir/storage/*/.libs/*.dylib>,<$bindir/plugin/*/.libs/*.dylib>,<$bindir/plugin/*/*/.libs/*.dylib>,<$bindir/sql/.libs/*.dylib>)
> +        {
> +          $dirs{dirname($_)}= 1;
> +        }
> +        push @ld_library_paths, keys(%dirs);
> +      }
>      }
>      else
>      {
>
> === modified file 'plugin/handler_socket/libhsclient/Makefile.am'
> --- a/plugin/handler_socket/libhsclient/Makefile.am	2011-05-12 15:01:36 +0000
> +++ b/plugin/handler_socket/libhsclient/Makefile.am	2011-05-13 13:58:17 +0000
> @@ -8,6 +8,5 @@
>  lib_LTLIBRARIES = libhsclient.la
>  libhsclient_la_SOURCES = config.cpp escape.cpp fatal.cpp hstcpcli.cpp \
>  	socket.cpp string_util.cpp
> -libhsclient_la_LDFLAGS = -static
>  libhsclient_la_CFLAGS = $(AM_CFLAGS) 
>  libhsclient_la_CXXFLAGS = $(AM_CXXFLAGS) 


Ok to push from me.

 - Kristian.