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
bd50a94c
Commit
bd50a94c
authored
Dec 21, 2018
by
Vicențiu Ciorbaru
Committed by
Vicențiu Ciorbaru
Dec 21, 2018
Browse files
Update c11_atomics patch to include mysys
parent
7de32a3b
Changes
1
Hide whitespace changes
Inline
Side-by-side
debian/patches/c11_atomics.patch
View file @
bd50a94c
Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
Date:
Thu
Dec 2
0
1
0:00:10
2018 +0200
Date:
Fri
Dec 2
1
1
9:14:04
2018 +0200
Link with libatomic to enable C11 atomics support
...
...
@@ -7,6 +7,8 @@ Date: Thu Dec 20 10:00:10 2018 +0200
atomic operations. Check first if support is available without
linking, otherwise use the library.
diff --git a/configure.cmake b/configure.cmake
index 42ba24961..2d183ea9f 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -926,7 +926,25 @@
int main()
...
...
@@ -36,6 +38,23 @@ Date: Thu Dec 20 10:00:10 2018 +0200
IF(WITH_VALGRIND)
SET(HAVE_valgrind 1)
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
index 97890cc9d..d4f264d7a 100644
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -78,6 +78,10 @@
TARGET_LINK_LIBRARIES(mysys dbug strings mysys_ssl ${ZLIB_LIBRARY}
${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
DTRACE_INSTRUMENT(mysys)
+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
+ TARGET_LINK_LIBRARIES(mysys atomic)
+ENDIF()
+
IF(HAVE_BFD_H)
TARGET_LINK_LIBRARIES(mysys bfd)
ENDIF(HAVE_BFD_H)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index d85e588ab..68dde1de6 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -178,6 +178,10 @@
ELSE()
...
...
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