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
cb0a661c
Commit
cb0a661c
authored
Mar 25, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't put libmysqlclient symbols extra-used on debian
in the libmysqlclient_16 version node.
parent
21a17536
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
29 deletions
+35
-29
libmysql/CMakeLists.txt
libmysql/CMakeLists.txt
+35
-29
No files found.
libmysql/CMakeLists.txt
View file @
cb0a661c
...
@@ -262,7 +262,35 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
...
@@ -262,7 +262,35 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
mysql_get_charset_by_csname
mysql_get_charset_by_csname
mysql_net_realloc
mysql_net_realloc
# And even more so on Debian, libmyodbc. Argh!
# PHP's mysqli.so requires this (via the ER() macro)
mysql_client_errors
# Also export the non-renamed variants
# (in case someone wants to rebuild mysqli-php or something similar)
# See MDEV-4127
default_charset_info
get_charset
get_charset_by_csname
net_realloc
client_errors
# pure-ftpd requires this
my_make_scrambled_password
# hydra requires this
scramble
# ODB requires this: https://bugzilla.redhat.com/show_bug.cgi?id=846602
THR_KEY_mysys
# DBD::mysql requires this
is_prefix
)
# And even more so on Debian
SET
(
CLIENT_API_5_5_EXTRA
# libmyodbc. Argh!
alloc_dynamic
alloc_dynamic
alloc_root
alloc_root
delete_dynamic
delete_dynamic
...
@@ -292,33 +320,9 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
...
@@ -292,33 +320,9 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
strmake_root
strmake_root
strxmov
strxmov
# PHP's mysqli.so requires this (via the ER() macro)
# pam_mysql.so
mysql_client_errors
# Also export the non-renamed variants
# (in case someone wants to rebuild mysqli-php or something similar)
# See MDEV-4127
default_charset_info
get_charset
get_charset_by_csname
net_realloc
client_errors
# pure-ftpd requires this
my_make_scrambled_password
# pam_mysql.so on Debian
make_scrambled_password
make_scrambled_password
make_scrambled_password_323
make_scrambled_password_323
# hydra requires this
scramble
# ODB requires this: https://bugzilla.redhat.com/show_bug.cgi?id=846602
THR_KEY_mysys
# DBD::mysql requires this
is_prefix
)
)
# Linker script to version symbols in Fedora- and Debian- compatible way, MDEV-5529
# Linker script to version symbols in Fedora- and Debian- compatible way, MDEV-5529
...
@@ -337,7 +341,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
...
@@ -337,7 +341,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
ENDFOREACH
()
ENDFOREACH
()
SET
(
CLIENT_API_5_5_LIST
)
SET
(
CLIENT_API_5_5_LIST
)
FOREACH
(
f
${
CLIENT_API_FUNCTIONS_5_5
}
)
FOREACH
(
f
${
CLIENT_API_FUNCTIONS_5_5
}
${
CLIENT_API_5_5_EXTRA
}
)
SET
(
CLIENT_API_5_5_LIST
"
${
CLIENT_API_5_5_LIST
}
\t
${
f
}
;
\n
"
)
SET
(
CLIENT_API_5_5_LIST
"
${
CLIENT_API_5_5_LIST
}
\t
${
f
}
;
\n
"
)
ENDFOREACH
()
ENDFOREACH
()
...
@@ -398,7 +402,9 @@ IF(UNIX)
...
@@ -398,7 +402,9 @@ IF(UNIX)
ENDIF
()
ENDIF
()
IF
(
NOT DISABLE_SHARED
)
IF
(
NOT DISABLE_SHARED
)
MERGE_LIBRARIES
(
libmysql SHARED
${
LIBS
}
EXPORTS
${
CLIENT_API_FUNCTIONS
}
${
CLIENT_API_5_1_EXTRA
}
COMPONENT SharedLibraries
)
MERGE_LIBRARIES
(
libmysql SHARED
${
LIBS
}
EXPORTS
${
CLIENT_API_FUNCTIONS
}
${
CLIENT_API_5_1_EXTRA
}
${
CLIENT_API_5_5_EXTRA
}
COMPONENT SharedLibraries
)
IF
(
UNIX
)
IF
(
UNIX
)
# libtool compatability
# libtool compatability
IF
(
CMAKE_SYSTEM_NAME MATCHES
"FreeBSD"
OR APPLE
)
IF
(
CMAKE_SYSTEM_NAME MATCHES
"FreeBSD"
OR APPLE
)
...
...
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