Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
888b8793
Commit
888b8793
authored
Aug 15, 2011
by
Daniel Fischer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Source plugin library files list from cmake-generated file in RPM builds
parent
afe0cb3f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
23 deletions
+9
-23
cmake/plugin.cmake
cmake/plugin.cmake
+4
-0
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+5
-23
No files found.
cmake/plugin.cmake
View file @
888b8793
...
@@ -196,6 +196,10 @@ MACRO(MYSQL_ADD_PLUGIN)
...
@@ -196,6 +196,10 @@ MACRO(MYSQL_ADD_PLUGIN)
# Install dynamic library
# Install dynamic library
MYSQL_INSTALL_TARGETS
(
${
target
}
DESTINATION
${
INSTALL_PLUGINDIR
}
COMPONENT Server
)
MYSQL_INSTALL_TARGETS
(
${
target
}
DESTINATION
${
INSTALL_PLUGINDIR
}
COMPONENT Server
)
INSTALL_DEBUG_TARGET
(
${
target
}
DESTINATION
${
INSTALL_PLUGINDIR
}
/debug
)
INSTALL_DEBUG_TARGET
(
${
target
}
DESTINATION
${
INSTALL_PLUGINDIR
}
/debug
)
# Add installed files to list for RPMs
FILE
(
APPEND
${
CMAKE_BINARY_DIR
}
/support-files/plugins.files
"%attr(755, root, root) %{_prefix}/
${
INSTALL_PLUGINDIR
}
/
${
ARG_MODULE_OUTPUT_NAME
}
.so
\n
"
"%attr(755, root, root) %{_prefix}/
${
INSTALL_PLUGINDIR
}
/debug/
${
ARG_MODULE_OUTPUT_NAME
}
.so
\n
"
)
# For internal testing in PB2, append collections files
# For internal testing in PB2, append collections files
IF
(
DEFINED ENV{PB2WORKDIR}
)
IF
(
DEFINED ENV{PB2WORKDIR}
)
PLUGIN_APPEND_COLLECTIONS
(
${
plugin
}
)
PLUGIN_APPEND_COLLECTIONS
(
${
plugin
}
)
...
...
support-files/mysql.spec.sh
View file @
888b8793
...
@@ -944,7 +944,7 @@ echo "=====" >> $STATUS_HISTORY
...
@@ -944,7 +944,7 @@ echo "=====" >> $STATUS_HISTORY
# Files section
# Files section
##############################################################################
##############################################################################
%files
-n
MySQL-server%
{
product_suffix
}
%files
-n
MySQL-server%
{
product_suffix
}
-f
release/support-files/plugins.files
%defattr
(
-,root,root,0755
)
%defattr
(
-,root,root,0755
)
%if %
{
defined license_files_server
}
%if %
{
defined license_files_server
}
...
@@ -1015,28 +1015,6 @@ echo "=====" >> $STATUS_HISTORY
...
@@ -1015,28 +1015,6 @@ echo "=====" >> $STATUS_HISTORY
%attr
(
755, root, root
)
%
{
_sbindir
}
/mysqld
%attr
(
755, root, root
)
%
{
_sbindir
}
/mysqld
%attr
(
755, root, root
)
%
{
_sbindir
}
/mysqld-debug
%attr
(
755, root, root
)
%
{
_sbindir
}
/mysqld-debug
%attr
(
755, root, root
)
%
{
_sbindir
}
/rcmysql
%attr
(
755, root, root
)
%
{
_sbindir
}
/rcmysql
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/adt_null.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/libdaemon_example.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/mypluglib.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/semisync_master.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/semisync_slave.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/auth.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/auth_socket.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/auth_test_plugin.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/qa_auth_client.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/qa_auth_interface.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/qa_auth_server.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/adt_null.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/libdaemon_example.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/mypluglib.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/semisync_master.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/semisync_slave.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/auth.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/auth_socket.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/auth_test_plugin.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/qa_auth_client.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/qa_auth_interface.so
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/debug/qa_auth_server.so
%if %
{
WITH_TCMALLOC
}
%if %
{
WITH_TCMALLOC
}
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/%
{
malloc_lib_target
}
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/%
{
malloc_lib_target
}
...
@@ -1131,6 +1109,10 @@ echo "=====" >> $STATUS_HISTORY
...
@@ -1131,6 +1109,10 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
# merging BK trees)
##############################################################################
##############################################################################
%changelog
%changelog
*
Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
- Source plugin library files list from cmake-generated file.
*
Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
*
Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
- Fix bug#12561297: Added the MySQL embedded binary
- Fix bug#12561297: Added the MySQL embedded binary
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment