]> git.pld-linux.org Git - packages/mysql.git/blobdiff - plugin-avoid-version.patch
projects / packages / mysql.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- always link with system readline and ssl, do not allow fallback to bundled one
[packages/mysql.git] / plugin-avoid-version.patch
diff --git a/plugin-avoid-version.patch b/plugin-avoid-version.patch
index 46bd7da488b80809ce35c219036655b74c66c4fc..9d72205354cf2fe6a5433baaa0e122cbba0be021 100644 (file)
--- a/plugin-avoid-version.patch
+++ b/plugin-avoid-version.patch
@@ -1,88 +1,126 @@
---- mysql-5.1.38/plugin/daemon_example/Makefile.am~    2009-08-21 15:11:25.000000000 +0300
-+++ mysql-5.1.38/plugin/daemon_example/Makefile.am     2009-09-04 14:01:26.664529401 +0300
+diff -ur mysql-5.1.50.org/plugin/daemon_example/Makefile.am mysql-5.1.50/plugin/daemon_example/Makefile.am
+--- mysql-5.1.50.org/plugin/daemon_example/Makefile.am 2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/plugin/daemon_example/Makefile.am     2010-09-23 20:52:58.514057048 +0200
 @@ -26,7 +26,7 @@
  
  EXTRA_LTLIBRARIES =   libdaemon_example.la
  pkgplugin_LTLIBRARIES =       @plugin_daemon_example_shared_target@
 -libdaemon_example_la_LDFLAGS =        -module -rpath $(pkgplugindir)
 +libdaemon_example_la_LDFLAGS =        -module -avoid-version -rpath $(pkgplugindir)
- libdaemon_example_la_CXXFLAGS=        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ libdaemon_example_la_CXXFLAGS=        $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  libdaemon_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  libdaemon_example_la_SOURCES =        daemon_example.cc
---- mysql-5.1.38/plugin/fulltext/Makefile.am~  2009-08-21 15:11:25.000000000 +0300
-+++ mysql-5.1.38/plugin/fulltext/Makefile.am   2009-09-04 14:01:51.531167265 +0300
-@@ -20,7 +20,7 @@
- #noinst_LTLIBRARIES= mypluglib.la
- pkgplugin_LTLIBRARIES= mypluglib.la
- mypluglib_la_SOURCES= plugin_example.c
--mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
-+mypluglib_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir)
- mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN
- 
- # Don't update the files from bitkeeper
---- mysql-5.1.38/storage/innodb_plugin/Makefile.am~    2009-08-21 15:12:38.000000000 +0300
-+++ mysql-5.1.38/storage/innodb_plugin/Makefile.am     2009-09-04 14:02:57.621203151 +0300
-@@ -330,7 +330,7 @@
- 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_LDFLAGS=  -module -avoid-version -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_SOURCES=  $(libinnobase_a_SOURCES)
---- mysql-5.1.38/storage/example/Makefile.am~  2009-08-21 15:12:32.000000000 +0300
-+++ mysql-5.1.38/storage/example/Makefile.am   2009-09-04 14:04:54.641149541 +0300
-@@ -34,7 +34,7 @@
- 
- EXTRA_LTLIBRARIES =   ha_example.la
- pkgplugin_LTLIBRARIES =       @plugin_example_shared_target@
--ha_example_la_LDFLAGS =       -module -rpath $(pkgplugindir)
-+ha_example_la_LDFLAGS =       -module -avoid-version -rpath $(pkgplugindir)
- ha_example_la_CXXFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_example_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_example_la_SOURCES =       ha_example.cc
---- mysql-5.1.38/storage/archive/Makefile.am~  2009-08-21 15:12:32.000000000 +0300
-+++ mysql-5.1.38/storage/archive/Makefile.am   2009-09-04 14:05:53.391143885 +0300
+diff -ur mysql-5.1.50.org/storage/archive/Makefile.am mysql-5.1.50/storage/archive/Makefile.am
+--- mysql-5.1.50.org/storage/archive/Makefile.am       2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/archive/Makefile.am   2010-09-23 20:53:04.487687594 +0200
 @@ -35,7 +35,7 @@
  
  EXTRA_LTLIBRARIES =   ha_archive.la
  pkgplugin_LTLIBRARIES =       @plugin_archive_shared_target@
 -ha_archive_la_LDFLAGS =       -module -rpath $(pkgplugindir)
 +ha_archive_la_LDFLAGS =       -module -avoid-version -rpath $(pkgplugindir)
- ha_archive_la_CXXFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_archive_la_CXXFLAGS=       $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_archive_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_archive_la_SOURCES =       ha_archive.cc azio.c
---- mysql-5.1.38/storage/blackhole/Makefile.am~        2009-08-21 15:12:32.000000000 +0300
-+++ mysql-5.1.38/storage/blackhole/Makefile.am 2009-09-04 14:06:08.374683695 +0300
+diff -ur mysql-5.1.50.org/storage/blackhole/Makefile.am mysql-5.1.50/storage/blackhole/Makefile.am
+--- mysql-5.1.50.org/storage/blackhole/Makefile.am     2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/blackhole/Makefile.am 2010-09-23 20:53:04.487687594 +0200
 @@ -34,7 +34,7 @@
  
  EXTRA_LTLIBRARIES =   ha_blackhole.la
  pkgplugin_LTLIBRARIES =       @plugin_blackhole_shared_target@
 -ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
 +ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir)
- ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_blackhole_la_CFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_blackhole_la_SOURCES=ha_blackhole.cc
---- mysql-5.1.38/storage/federated/Makefile.am~        2009-08-21 15:12:33.000000000 +0300
-+++ mysql-5.1.38/storage/federated/Makefile.am 2009-09-04 14:06:24.741287557 +0300
+diff -ur mysql-5.1.50.org/storage/csv/Makefile.am mysql-5.1.50/storage/csv/Makefile.am
+--- mysql-5.1.50.org/storage/csv/Makefile.am   2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/csv/Makefile.am       2010-09-23 20:53:04.487687596 +0200
+@@ -31,7 +31,7 @@
+ 
+ EXTRA_LTLIBRARIES =   ha_csv.la
+ pkglib_LTLIBRARIES =  @plugin_csv_shared_target@
+-ha_csv_la_LDFLAGS =   -module -rpath $(MYSQLLIBdir)
++ha_csv_la_LDFLAGS =   -module -avoid-version -rpath $(MYSQLLIBdir)
+ ha_csv_la_CXXFLAGS =  $(AM_CXXFLAGS) -DMYSQL_PLUGIN
+ ha_csv_la_SOURCES =   transparent_file.cc ha_tina.cc 
+ 
+diff -ur mysql-5.1.50.org/storage/example/Makefile.am mysql-5.1.50/storage/example/Makefile.am
+--- mysql-5.1.50.org/storage/example/Makefile.am       2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/example/Makefile.am   2010-09-23 20:53:04.487687596 +0200
+@@ -34,7 +34,7 @@
+ 
+ EXTRA_LTLIBRARIES =   ha_example.la
+ pkgplugin_LTLIBRARIES =       @plugin_example_shared_target@
+-ha_example_la_LDFLAGS =       -module -rpath $(pkgplugindir)
++ha_example_la_LDFLAGS =       -module -avoid-version -rpath $(pkgplugindir)
+ ha_example_la_CXXFLAGS=       $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_example_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_example_la_SOURCES =       ha_example.cc
+diff -ur mysql-5.1.50.org/storage/federated/Makefile.am mysql-5.1.50/storage/federated/Makefile.am
+--- mysql-5.1.50.org/storage/federated/Makefile.am     2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/federated/Makefile.am 2010-09-23 20:53:04.487687596 +0200
 @@ -34,7 +34,7 @@
  
  EXTRA_LTLIBRARIES =   ha_federated.la
  pkgplugin_LTLIBRARIES =       @plugin_federated_shared_target@
 -ha_federated_la_LDFLAGS =     -module -rpath $(pkgplugindir)
 +ha_federated_la_LDFLAGS =     -module -avoid-version -rpath $(pkgplugindir)
- ha_federated_la_CXXFLAGS=     $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_federated_la_CXXFLAGS=     $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_federated_la_CFLAGS =      $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_federated_la_SOURCES =     ha_federated.cc
---- mysql-5.1.38/storage/ibmdb2i/Makefile.am~  2009-08-21 15:12:33.000000000 +0300
-+++ mysql-5.1.38/storage/ibmdb2i/Makefile.am   2009-09-04 14:07:07.067803277 +0300
+diff -ur mysql-5.1.50.org/storage/ibmdb2i/Makefile.am mysql-5.1.50/storage/ibmdb2i/Makefile.am
+--- mysql-5.1.50.org/storage/ibmdb2i/Makefile.am       2010-08-03 19:24:22.000000000 +0200
++++ mysql-5.1.50/storage/ibmdb2i/Makefile.am   2010-09-23 20:53:04.491021090 +0200
 @@ -33,7 +33,7 @@
  EXTRA_LTLIBRARIES =   ha_ibmdb2i.la
  pkgplugin_LTLIBRARIES =       @plugin_ibmdb2i_shared_target@
  ha_ibmdb2i_la_LIBADD =  -liconv
 -ha_ibmdb2i_la_LDFLAGS =       -module -rpath $(MYSQLLIBdir)
 +ha_ibmdb2i_la_LDFLAGS =       -module -avoid-version -rpath $(MYSQLLIBdir)
- ha_ibmdb2i_la_CXXFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_ibmdb2i_la_CXXFLAGS=       $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_ibmdb2i_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_ibmdb2i_la_SOURCES =       ha_ibmdb2i.cc db2i_ileBridge.cc db2i_conversion.cc \
+diff -ur mysql-5.1.50.org/storage/innobase/Makefile.am mysql-5.1.50/storage/innobase/Makefile.am
+--- mysql-5.1.50.org/storage/innobase/Makefile.am      2010-08-03 19:24:20.000000000 +0200
++++ mysql-5.1.50/storage/innobase/Makefile.am  2010-09-23 20:53:04.494354584 +0200
+@@ -162,7 +162,7 @@
+ EXTRA_LTLIBRARIES=    ha_innodb.la
+ pkgplugin_LTLIBRARIES=        @plugin_innobase_shared_target@
+ 
+-ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir)
++ha_innodb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir)
+ ha_innodb_la_CXXFLAGS=        $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_la_CFLAGS=  $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES)
+diff -ur mysql-5.1.50.org/storage/innodb_plugin/Makefile.am mysql-5.1.50/storage/innodb_plugin/Makefile.am
+--- mysql-5.1.50.org/storage/innodb_plugin/Makefile.am 2010-08-03 19:24:19.000000000 +0200
++++ mysql-5.1.50/storage/innodb_plugin/Makefile.am     2010-09-23 20:53:04.494354584 +0200
+@@ -331,7 +331,7 @@
+ 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_LDFLAGS=  -module -avoid-version -rpath $(pkgplugindir)
+ ha_innodb_plugin_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_CFLAGS=   $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_SOURCES=  $(libinnobase_a_SOURCES)
+diff -ur mysql-5.1.50.org/storage/sphinx/Makefile.am mysql-5.1.50/storage/sphinx/Makefile.am
+--- mysql-5.1.50.org/storage/sphinx/Makefile.am        2010-09-23 20:51:48.660581537 +0200
++++ mysql-5.1.50/storage/sphinx/Makefile.am    2010-09-23 20:53:05.261059401 +0200
+@@ -38,12 +38,12 @@
+ EXTRA_LTLIBRARIES =   ha_sphinx.la
+ pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la
+ 
+-ha_sphinx_la_LDFLAGS =        -module -avoid-version -rpath $(MYSQLLIBdir)
++ha_sphinx_la_LDFLAGS =        -module -avoid-version -avoid-version -rpath $(MYSQLLIBdir)
+ ha_sphinx_la_CXXFLAGS=        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_sphinx_la_SOURCES =        ha_sphinx.cc
+ 
+-sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir)
++sphinx_la_LDFLAGS = -module -avoid-version -avoid-version -rpath $(MYSQLLIBdir)
+ sphinx_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ sphinx_la_SOURCES = snippets_udf.cc
MySQL: a very fast and reliable SQL database engine
This page took 0.033102 seconds and 4 git commands to generate.