diff options
| author | unknown <antony@pcg5ppc.xiphis.org> | 2007-10-25 21:19:28 -0700 |
|---|---|---|
| committer | unknown <antony@pcg5ppc.xiphis.org> | 2007-10-25 21:19:28 -0700 |
| commit | 0bb55050d142a3408908ca4d7e8b3db0d698ebf0 (patch) | |
| tree | c1bae9176eedaa7470e9c269563fbad377abe794 /config/ac-macros/plugins.m4 | |
| parent | 957d8665068156583acf69c01890572e7604933d (diff) | |
| download | mariadb-git-0bb55050d142a3408908ca4d7e8b3db0d698ebf0.tar.gz | |
Bug#30296
"Dynamic plugins fail to load on FreeBSD"
ELF executables need to be linked using the -export-dynamic option to
ld(1) for symbols defined in the executable to become visible to dlsym().
Also, do not build plugins on an all-static build.
configure.in:
Bug#30296
Use "-export-dynamic" when building executable for use with plugins.
Add required option using MYSQLD_EXTRA_LDFLAGS variable so we do not
affect any other binary.
config/ac-macros/plugins.m4:
Do not build plugins when building all-static
sql/sql_yacc.yy:
build fix - surplus semicolon
Diffstat (limited to 'config/ac-macros/plugins.m4')
| -rw-r--r-- | config/ac-macros/plugins.m4 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 48754563992..8dfb698709f 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -360,6 +360,17 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ AC_MSG_ERROR([cannot disable mandatory plugin]) fi [mysql_plugin_]$2=yes + ],[ + case "$with_mysqld_ldflags " in + *"-all-static "*) + # No need to build shared plugins when mysqld is linked with + # -all-static as it won't be able to load them. + if test "X[$mysql_plugin_]$2" != Xyes -a \ + "X[$with_plugin_]$2" != Xyes; then + [with_plugin_]$2=no + fi + ;; + esac ]) if test "X[$with_plugin_]$2" = Xno; then AC_MSG_RESULT([no]) |