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
dc23a950
Commit
dc23a950
authored
May 01, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Solaris compilation failure: xtradb is linked in statically, ha_innodb.so needs
the linker script.
parent
302e4776
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
storage/innobase/CMakeLists.txt
storage/innobase/CMakeLists.txt
+10
-0
storage/innobase/plugin_exports
storage/innobase/plugin_exports
+0
-0
storage/xtradb/CMakeLists.txt
storage/xtradb/CMakeLists.txt
+0
-10
No files found.
storage/innobase/CMakeLists.txt
View file @
dc23a950
...
...
@@ -391,6 +391,16 @@ IF(WITH_INNODB)
SET
(
WITH_INNOBASE_STORAGE_ENGINE TRUE
)
ENDIF
()
# On solaris, reduce symbol visibility, so loader does not mix
# the same symbols from builtin innodb and from shared one.
# Only required for old GCC (3.4.3) that does not support hidden visibility
IF
(
CMAKE_SYSTEM_NAME MATCHES
"SunOS"
AND CMAKE_COMPILER_IS_GNUCC
AND NOT HAVE_VISIBILITY_HIDDEN
)
SET
(
LINKER_SCRIPT
"-Wl,-M
${
CMAKE_CURRENT_SOURCE_DIR
}
/plugin_exports"
)
ELSE
()
SET
(
LINKER_SCRIPT
)
ENDIF
()
MYSQL_ADD_PLUGIN
(
innobase
${
INNOBASE_SOURCES
}
STORAGE_ENGINE
MODULE_ONLY
MODULE_OUTPUT_NAME ha_innodb
...
...
storage/
xtradb
/plugin_exports
→
storage/
innobase
/plugin_exports
View file @
dc23a950
File moved
storage/xtradb/CMakeLists.txt
View file @
dc23a950
...
...
@@ -400,16 +400,6 @@ IF(WITH_INNODB)
SET
(
WITH_INNOBASE_STORAGE_ENGINE TRUE
)
ENDIF
()
# On solaris, reduce symbol visibility, so loader does not mix
# the same symbols from builtin innodb and from shared one.
# Only required for old GCC (3.4.3) that does not support hidden visibility
IF
(
CMAKE_SYSTEM_NAME MATCHES
"SunOS"
AND CMAKE_COMPILER_IS_GNUCC
AND NOT HAVE_VISIBILITY_HIDDEN
)
SET
(
LINKER_SCRIPT
"-Wl,-M
${
CMAKE_CURRENT_SOURCE_DIR
}
/plugin_exports"
)
ELSE
()
SET
(
LINKER_SCRIPT
)
ENDIF
()
IF
(
XTRADB_OK
)
MYSQL_ADD_PLUGIN
(
xtradb
${
INNOBASE_SOURCES
}
STORAGE_ENGINE
DEFAULT
...
...
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