[Commits] Rev 2922: build dynamic plugins with the -shared libtool option to avoid in http://bazaar.launchpad.net/~maria-captains/maria/5.1/

serg at askmonty.org serg at askmonty.org
Thu Sep 9 16:35:53 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1/

------------------------------------------------------------
revno: 2922
revision-id: sergii at pisem.net-20100909133547-jk5gsay6601t5enp
parent: sergii at pisem.net-20100830063056-07nul4hp9thcvwah
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.1
timestamp: Thu 2010-09-09 15:35:47 +0200
message:
  build dynamic plugins with the -shared libtool option to avoid
  double compilation
-------------- next part --------------
=== modified file 'plugin/daemon_example/Makefile.am'
--- a/plugin/daemon_example/Makefile.am	2008-01-02 13:00:46 +0000
+++ b/plugin/daemon_example/Makefile.am	2010-09-09 13:35:47 +0000
@@ -27,11 +27,9 @@ INCLUDES =              -I$(top_srcdir)/
 EXTRA_LTLIBRARIES =     libdaemon_example.la
 pkgplugin_LTLIBRARIES = @plugin_daemon_example_shared_target@
 libdaemon_example_la_LDFLAGS =  -module -rpath $(pkgplugindir)
-libdaemon_example_la_CXXFLAGS=  $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libdaemon_example_la_CFLAGS =   $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+libdaemon_example_la_CXXFLAGS=  -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 libdaemon_example_la_SOURCES =  daemon_example.cc
 
-
 EXTRA_LIBRARIES =       libdaemon_example.a
 noinst_LIBRARIES =      @plugin_daemon_example_static_target@
 libdaemon_example_a_CXXFLAGS =  $(AM_CFLAGS)

=== modified file 'plugin/fulltext/Makefile.am'
--- a/plugin/fulltext/Makefile.am	2008-01-02 13:00:46 +0000
+++ b/plugin/fulltext/Makefile.am	2010-09-09 13:35:47 +0000
@@ -21,7 +21,7 @@ INCLUDES= -I$(top_builddir)/include -I$(
 pkgplugin_LTLIBRARIES= mypluglib.la
 mypluglib_la_SOURCES= plugin_example.c
 mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
-mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN
+mypluglib_la_CFLAGS= -shared -DMYSQL_DYNAMIC_PLUGIN
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

=== modified file 'storage/archive/Makefile.am'
--- a/storage/archive/Makefile.am	2008-01-02 13:00:46 +0000
+++ b/storage/archive/Makefile.am	2010-09-09 13:35:47 +0000
@@ -36,8 +36,8 @@ noinst_PROGRAMS	=	archive_test archive_r
 EXTRA_LTLIBRARIES =     ha_archive.la
 pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@
 ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir)
-ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_archive_la_CFLAGS =  $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_archive_la_CXXFLAGS= -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_archive_la_CFLAGS =  -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_archive_la_SOURCES = ha_archive.cc azio.c
 
 

=== modified file 'storage/blackhole/Makefile.am'
--- a/storage/blackhole/Makefile.am	2008-01-02 13:00:46 +0000
+++ b/storage/blackhole/Makefile.am	2010-09-09 13:35:47 +0000
@@ -35,8 +35,8 @@ noinst_HEADERS =	ha_blackhole.h
 EXTRA_LTLIBRARIES =     ha_blackhole.la
 pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@
 ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
-ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_blackhole_la_CXXFLAGS=-shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_blackhole_la_CFLAGS= -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_blackhole_la_SOURCES=ha_blackhole.cc
 
 

=== modified file 'storage/csv/Makefile.am'
--- a/storage/csv/Makefile.am	2007-01-04 18:54:52 +0000
+++ b/storage/csv/Makefile.am	2010-09-09 13:35:47 +0000
@@ -32,7 +32,7 @@ noinst_HEADERS	  =	ha_tina.h transparent
 EXTRA_LTLIBRARIES =     ha_csv.la
 pkglib_LTLIBRARIES =    @plugin_csv_shared_target@
 ha_csv_la_LDFLAGS =     -module -rpath $(MYSQLLIBdir)
-ha_csv_la_CXXFLAGS =    $(AM_CFLAGS) -DMYSQL_PLUGIN
+ha_csv_la_CXXFLAGS =    -shared $(AM_CFLAGS) -DMYSQL_PLUGIN
 ha_csv_la_SOURCES =     transparent_file.cc ha_tina.cc 
 
 EXTRA_LIBRARIES =       libcsv.a

=== modified file 'storage/example/Makefile.am'
--- a/storage/example/Makefile.am	2008-01-02 13:00:46 +0000
+++ b/storage/example/Makefile.am	2010-09-09 13:35:47 +0000
@@ -35,11 +35,9 @@ noinst_HEADERS =	ha_example.h
 EXTRA_LTLIBRARIES =     ha_example.la
 pkgplugin_LTLIBRARIES = @plugin_example_shared_target@
 ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir)
-ha_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_example_la_CFLAGS =  $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_example_la_CXXFLAGS= -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_example_la_SOURCES = ha_example.cc
 
-
 EXTRA_LIBRARIES =       libexample.a
 noinst_LIBRARIES =      @plugin_example_static_target@
 libexample_a_CXXFLAGS = $(AM_CFLAGS)

=== modified file 'storage/federated/Makefile.am'
--- a/storage/federated/Makefile.am	2010-06-09 21:29:18 +0000
+++ b/storage/federated/Makefile.am	2010-09-09 13:35:47 +0000
@@ -33,8 +33,8 @@ noinst_HEADERS =	ha_federated.h
 EXTRA_LTLIBRARIES =     ha_federated.la
 pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@
 ha_federated_la_LDFLAGS =       -module -rpath $(pkgplugindir)
-ha_federated_la_CXXFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_federated_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_federated_la_CXXFLAGS=       -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_federated_la_CFLAGS =        -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_federated_la_SOURCES =       ha_federated.cc $(top_srcdir)/mysys/string.c
 
 

=== modified file 'storage/federatedx/Makefile.am'
--- a/storage/federatedx/Makefile.am	2010-06-09 21:29:18 +0000
+++ b/storage/federatedx/Makefile.am	2010-09-09 13:35:47 +0000
@@ -20,8 +20,8 @@ noinst_HEADERS =	ha_federatedx.h federat
 EXTRA_LTLIBRARIES =     ha_federatedx.la
 pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@
 ha_federatedx_la_LDFLAGS =      -module -rpath $(pkgplugindir)
-ha_federatedx_la_CXXFLAGS=      $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_federatedx_la_CFLAGS =       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_federatedx_la_CXXFLAGS=      -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_federatedx_la_CFLAGS =       -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 
 
 EXTRA_LIBRARIES =       libfederatedx.a

=== modified file 'storage/innobase/Makefile.am'
--- a/storage/innobase/Makefile.am	2010-03-30 16:03:46 +0000
+++ b/storage/innobase/Makefile.am	2010-09-09 13:35:47 +0000
@@ -163,8 +163,8 @@ EXTRA_LTLIBRARIES=	ha_innodb.la
 pkgplugin_LTLIBRARIES=  @plugin_innobase_shared_target@
 
 ha_innodb_la_LDFLAGS=   -module -rpath $(pkgplugindir)
-ha_innodb_la_CXXFLAGS=  $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_innodb_la_CFLAGS=    $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_la_CXXFLAGS=  -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_la_CFLAGS=    -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_innodb_la_SOURCES=   $(libinnobase_a_SOURCES)
 
 EXTRA_DIST=             CMakeLists.txt plug.in \

=== modified file 'storage/innodb_plugin/Makefile.am'
--- a/storage/innodb_plugin/Makefile.am	2010-04-07 17:24:43 +0000
+++ b/storage/innodb_plugin/Makefile.am	2010-09-09 13:35:47 +0000
@@ -332,8 +332,8 @@ EXTRA_LTLIBRARIES=	ha_innodb_plugin.la
 pkgplugin_LTLIBRARIES=  @plugin_innodb_plugin_shared_target@
 
 ha_innodb_plugin_la_LDFLAGS=    -module -rpath $(pkgplugindir)
-ha_innodb_plugin_la_CXXFLAGS=   $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_innodb_plugin_la_CFLAGS=     $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_plugin_la_CXXFLAGS=   -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_plugin_la_CFLAGS=     -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_innodb_plugin_la_SOURCES=    $(libinnobase_a_SOURCES)
 
 EXTRA_DIST=             CMakeLists.txt plug.in \

=== modified file 'storage/pbxt/src/Makefile.am'
--- a/storage/pbxt/src/Makefile.am	2009-12-22 10:33:20 +0000
+++ b/storage/pbxt/src/Makefile.am	2010-09-09 13:35:47 +0000
@@ -40,8 +40,8 @@ libpbxt_la_LDFLAGS =	-module
 # These are the warning Drizzle uses:
 # DRIZZLE_WARNINGS =            -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter
 
-libpbxt_la_CXXFLAGS =   $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libpbxt_la_CFLAGS =             $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99
+libpbxt_la_CXXFLAGS =   -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+libpbxt_la_CFLAGS =     -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99
 
 EXTRA_LIBRARIES =               libpbxt.a
 noinst_LIBRARIES =              libpbxt.a

=== modified file 'storage/xtradb/Makefile.am'
--- a/storage/xtradb/Makefile.am	2010-08-04 08:39:53 +0000
+++ b/storage/xtradb/Makefile.am	2010-09-09 13:35:47 +0000
@@ -333,8 +333,8 @@ EXTRA_LTLIBRARIES=	ha_xtradb.la
 pkgplugin_LTLIBRARIES=  @plugin_xtradb_shared_target@
 
 ha_xtradb_la_LDFLAGS=   -module -rpath $(pkgplugindir)
-ha_xtradb_la_CXXFLAGS=  $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_xtradb_la_CFLAGS=    $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_xtradb_la_CXXFLAGS=  -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_xtradb_la_CFLAGS=    -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_xtradb_la_SOURCES=   $(libxtradb_a_SOURCES)
 
 EXTRA_DIST=             CMakeLists.txt plug.in \



More information about the commits mailing list