[packages/percona-server/v5.1.x: 19/21] add avoid-version for: plugin/mypluglib.so

glen glen at pld-linux.org
Wed Oct 21 16:09:45 CEST 2015 

commit d52b7306cc5ecf76018df4cc69271f8db7ec4273
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Aug 9 11:54:20 2013 +0300

    add avoid-version for: plugin/mypluglib.so

 mysql-ndb-cpc.init         |  0
 mysql-ndb-mgm.init         |  0
 mysql-ndb.init             |  0
 mysql.init                 |  0
 mysql.spec                 |  6 +-----
 percona.sh                 |  0
 plugin-avoid-version.patch | 20 +++++++++++---------
 7 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index c9e54a3..695818c 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -8,10 +8,6 @@
 # - segfaults on select from non-mysql user (caused by builder environment):
 #     https://bugs.launchpad.net/pld-linux/+bug/381904
 #     (profiling disabled temporaily to workaround this)
-# - add avoid-version for:
-#        /usr/lib64/mysql/plugin/mypluglib.so
-#        /usr/lib64/mysql/plugin/mypluglib.so.0
-#        /usr/lib64/mysql/plugin/mypluglib.so.0.0.0
 #
 # Conditional build:
 %bcond_with	autodeps	# BR packages needed only for resolving deps
@@ -877,7 +873,7 @@ done
 %dir %{_libdir}/mysql
 %dir %{_libdir}/mysql/plugin
 %attr(755,root,root) %{_libdir}/mysql/plugin/ha_innodb.so
-%attr(755,root,root) %{_libdir}/mysql/plugin/mypluglib.*
+%attr(755,root,root) %{_libdir}/mysql/plugin/mypluglib.so
 %if %{with sphinx}
 %attr(755,root,root) %{_libdir}/mysql/plugin/sphinx.so
 %endif
diff --git a/mysql-ndb-cpc.init b/mysql-ndb-cpc.init
old mode 100644
new mode 100755
diff --git a/mysql-ndb-mgm.init b/mysql-ndb-mgm.init
old mode 100644
new mode 100755
diff --git a/mysql-ndb.init b/mysql-ndb.init
old mode 100644
new mode 100755
diff --git a/mysql.init b/mysql.init
old mode 100644
new mode 100755
diff --git a/percona.sh b/percona.sh
old mode 100644
new mode 100755
diff --git a/plugin-avoid-version.patch b/plugin-avoid-version.patch
index 445ebd3..6aee69c 100644
--- a/plugin-avoid-version.patch
+++ b/plugin-avoid-version.patch
@@ -1,4 +1,3 @@
-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 @@
@@ -10,7 +9,6 @@ diff -ur mysql-5.1.50.org/plugin/daemon_example/Makefile.am mysql-5.1.50/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
-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 @@
@@ -22,7 +20,6 @@ diff -ur mysql-5.1.50.org/storage/archive/Makefile.am mysql-5.1.50/storage/archi
  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
-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 @@
@@ -34,7 +31,6 @@ diff -ur mysql-5.1.50.org/storage/blackhole/Makefile.am mysql-5.1.50/storage/bla
  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
-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 @@
@@ -46,7 +42,6 @@ diff -ur mysql-5.1.50.org/storage/csv/Makefile.am mysql-5.1.50/storage/csv/Makef
  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 @@
@@ -58,7 +53,6 @@ diff -ur mysql-5.1.50.org/storage/example/Makefile.am mysql-5.1.50/storage/examp
  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 @@
@@ -70,7 +64,6 @@ diff -ur mysql-5.1.50.org/storage/federated/Makefile.am mysql-5.1.50/storage/fed
  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
-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 @@
@@ -82,7 +75,6 @@ diff -ur mysql-5.1.50.org/storage/innobase/Makefile.am mysql-5.1.50/storage/inno
  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 @@
@@ -94,7 +86,6 @@ diff -ur mysql-5.1.50.org/storage/innodb_plugin/Makefile.am mysql-5.1.50/storage
  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 @@
@@ -112,3 +103,14 @@ diff -ur mysql-5.1.50.org/storage/sphinx/Makefile.am mysql-5.1.50/storage/sphinx
  sphinx_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  sphinx_la_SOURCES = snippets_udf.cc
+--- Percona-Server-5.1.70-rel14.8/plugin/fulltext/Makefile.am~	2013-06-06 22:46:49.000000000 +0300
++++ Percona-Server-5.1.70-rel14.8/plugin/fulltext/Makefile.am	2013-08-09 03:24:10.599809997 +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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/bf636d07b36bfd2921b9ecf2033c78270355c98c

More information about the pld-cvs-commit mailing list