Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Samuel Thibault
mariadb-10.1
Commits
78cfa2c2
Commit
78cfa2c2
authored
Oct 09, 2017
by
Ondrej Sury
Browse files
Add extra symbols aliases for libmariadbclient_16
parent
020f85b4
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
debian/libmariadbclient18.symbols
View file @
78cfa2c2
This diff is collapsed.
Click to expand it.
debian/libmariadbclient18.symbols.Base
deleted
100644 → 0
View file @
020f85b4
This diff is collapsed.
Click to expand it.
debian/libmariadbclient18.symbols.hurd-i386
deleted
100644 → 0
View file @
020f85b4
This diff is collapsed.
Click to expand it.
debian/libmariadbclient18.symbols.kfreebsd-amd64
deleted
120000 → 0
View file @
020f85b4
libmariadbclient18.symbols.Base
\ No newline at end of file
debian/libmariadbclient18.symbols.kfreebsd-i386
deleted
100644 → 0
View file @
020f85b4
This diff is collapsed.
Click to expand it.
debian/patches/libmariadbclient-rename.patch
View file @
78cfa2c2
...
...
@@ -5,13 +5,13 @@ Subject: libmariadbclient-rename
---
client/CMakeLists.txt | 24 ++++++++++++------------
cmake/for_clients.cmake | 8 ++++----
libmysql/CMakeLists.txt | 2
2
+++++++++++-----------
libmysql/CMakeLists.txt | 2
7 +++++
+++++++++++-----------
man/mysql_config.1 | 6 +++---
scripts/make_win_bin_dist | 8 ++++----
scripts/mysql_config.pl.in | 6 +++---
tests/CMakeLists.txt | 6 +++---
unittest/mysys/CMakeLists.txt | 2 +-
8 files changed, 4
1
insertions(+), 41 deletions(-)
8 files changed, 4
6
insertions(+), 41 deletions(-)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index e4643ad..523912e 100644
...
...
@@ -114,10 +114,29 @@ index dd79ea1..879da78 100644
MACRO(REPLACE_FOR_CLIENTS VAR)
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index acbd80b..
6399b15
100644
index acbd80b..
5819d79
100644
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -457,13 +457,13 @@
ADD_DEPENDENCIES(clientlib GenError)
@@ -398,6 +398,10 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
libmysqlclient_16 {
/* empty here. aliases are added above */
};
+
+ libmariadbclient_16 {
+ /* empty here. aliases are added above */
+ };
}
")
@@ -407,6 +411,7 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
FOREACH (f ${CLIENT_API_FUNCTIONS_5_1} ${CLIENT_API_5_1_EXTRA})
SET(CLIENT_API_5_1_LIST "${CLIENT_API_5_1_LIST}\t${f};\n")
SET(CLIENT_API_5_1_ALIASES "${CLIENT_API_5_1_ALIASES}\"${f}@libmysqlclient_16\" = ${f};\n")
+ SET(DEBIAN9_ALIASES "${DEBIAN9_ALIASES}\"${f}@libmariadbclient_16\" = ${f};\n")
SET(DEBIAN9_ALIASES "${DEBIAN9_ALIASES}\"${f}@libmariadbclient_18\" = ${f};\n")
ENDFOREACH()
@@ -457,13 +462,13 @@
ADD_DEPENDENCIES(clientlib GenError)
SET(LIBS clientlib dbug strings vio mysys mysys_ssl ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
...
...
@@ -134,7 +153,7 @@ index acbd80b..6399b15 100644
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
ENDIF()
@@ -479,7 +4
79
,7 @@
IF(UNIX)
@@ -479,7 +4
84
,7 @@
IF(UNIX)
SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
ENDIF()
ENDMACRO()
...
...
@@ -143,7 +162,7 @@ index acbd80b..6399b15 100644
ENDIF()
IF(NOT DISABLE_SHARED)
@@ -495,9 +
495
,9 @@
IF(NOT DISABLE_SHARED)
@@ -495,9 +
500
,9 @@
IF(NOT DISABLE_SHARED)
ELSE()
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
ENDIF()
...
...
@@ -155,7 +174,7 @@ index acbd80b..6399b15 100644
VERSION "${OS_SHARED_LIB_VERSION}"
SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS)
@@ -510,13 +51
0
,13 @@
IF(NOT DISABLE_SHARED)
@@ -510,13 +51
5
,13 @@
IF(NOT DISABLE_SHARED)
"${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}")
ENDIF()
# clean direct output needs to be set several targets have the same name
...
...
@@ -173,7 +192,7 @@ index acbd80b..6399b15 100644
"${CMAKE_SHARED_LIBRARY_SUFFIX}"
""
linkname)
@@ -525,7 +5
25
,7 @@
IF(NOT DISABLE_SHARED)
@@ -525,7 +5
30
,7 @@
IF(NOT DISABLE_SHARED)
LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS)
FOREACH(ver ${OS_SHARED_LIB_SYMLINKS})
GET_VERSIONED_LIBNAME(
...
...
debian/rules
View file @
78cfa2c2
...
...
@@ -8,6 +8,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
# Only do a strict symbol checking on Linux
ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
DPKG_GENSYMBOLS_CHECK_LEVEL := 4
endif
BUILDDIR := builddir
DEB_VERSION_REVISION := $(shell echo $(DEB_VERSION) | sed -e 's/^.*-//')
RELEASE := $(shell lsb_release -r -s) # Use changelog based DEB_DISTRIBUTION instead?
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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