mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-17 23:34:07 +00:00
extra/mariadb: fix
This commit is contained in:
Kevin Mihelich
parent
f79049f678
commit
0fd51a6353
3 changed files with 78 additions and 36 deletions
75
extra/mariadb/0001-libatomic.patch
Normal file
75
extra/mariadb/0001-libatomic.patch
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
From 1b17400c33fa153847c9dea750b25fbe06c70501 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Fri, 2 Aug 2019 12:00:41 -0600
|
||||
Subject: [PATCH] libatomic
|
||||
|
||||
---
|
||||
configure.cmake | 3 +++
|
||||
libmysqld/CMakeLists.txt | 1 +
|
||||
sql/CMakeLists.txt | 3 ++-
|
||||
storage/rocksdb/build_rocksdb.cmake | 2 +-
|
||||
4 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.cmake b/configure.cmake
|
||||
index 6b8bbed636e..278c930260b 100644
|
||||
--- a/configure.cmake
|
||||
+++ b/configure.cmake
|
||||
@@ -859,6 +859,8 @@ SET(SIGNAL_WITH_VIO_CLOSE 1)
|
||||
MARK_AS_ADVANCED(NO_ALARM)
|
||||
|
||||
|
||||
+SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
|
||||
+SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} atomic)
|
||||
CHECK_CXX_SOURCE_COMPILES("
|
||||
int main()
|
||||
{
|
||||
@@ -867,6 +869,7 @@ int main()
|
||||
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
|
||||
}"
|
||||
HAVE_GCC_C11_ATOMICS)
|
||||
+SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})
|
||||
|
||||
IF(WITH_VALGRIND)
|
||||
SET(HAVE_valgrind 1)
|
||||
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
|
||||
index 72e70ca0725..3722dce6325 100644
|
||||
--- a/libmysqld/CMakeLists.txt
|
||||
+++ b/libmysqld/CMakeLists.txt
|
||||
@@ -154,6 +154,7 @@ SET(LIBS
|
||||
${LIBWRAP} ${LIBCRYPT} ${LIBDL}
|
||||
${MYSQLD_STATIC_PLUGIN_LIBS}
|
||||
sql_embedded
|
||||
+ atomic
|
||||
)
|
||||
|
||||
# Some storage engine were compiled for embedded specifically
|
||||
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
|
||||
index 90a6a32756c..9c41e9ee0bb 100644
|
||||
--- a/sql/CMakeLists.txt
|
||||
+++ b/sql/CMakeLists.txt
|
||||
@@ -181,7 +181,8 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS}
|
||||
${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
|
||||
${WSREP_LIB}
|
||||
${SSL_LIBRARIES}
|
||||
- ${LIBSYSTEMD})
|
||||
+ ${LIBSYSTEMD}
|
||||
+ atomic)
|
||||
|
||||
IF(WIN32)
|
||||
SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
|
||||
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
|
||||
index 96da9737dbc..f80385882bb 100644
|
||||
--- a/storage/rocksdb/build_rocksdb.cmake
|
||||
+++ b/storage/rocksdb/build_rocksdb.cmake
|
||||
@@ -469,7 +469,7 @@ INCLUDE_DIRECTORIES(${ROCKSDB_SOURCE_DIR}/util)
|
||||
list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
|
||||
|
||||
ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
|
||||
-target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
|
||||
+target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS} atomic)
|
||||
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp")
|
||||
endif()
|
||||
--
|
||||
2.22.0
|
||||
|
||||
|
|
@ -21,14 +21,14 @@ source=("https://mirrors.n-ix.net/mariadb/mariadb-$pkgver/source/mariadb-$pkgver
|
|||
'0002-systemd-sysusers-tmpfiles.patch'
|
||||
'0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch'
|
||||
'0007-systemd-service-add-instance-name-in-description.patch'
|
||||
'atomic.patch')
|
||||
'0001-libatomic.patch')
|
||||
sha256sums=('c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817'
|
||||
'SKIP'
|
||||
'ce72ea1563ad773e00e8b1c299babea176abae1102827c2f743921e9de615041'
|
||||
'3e83467af80fbd53400a201a34fc858b88509ea8e88b10709947eb66545f9457'
|
||||
'c8c801f80924ccb97b499552fe1c532b3ebf8f86cdfc0d23715d4adb1a8810f0'
|
||||
'd4575c349fdc6268135cd3483e70e04b149ec8004583bac7f79f190a084cbfc8'
|
||||
'34846fc33eda8600741e7ef48d00ce7a820006d4b731690eca5fa8d726c9c593')
|
||||
'1c7360453b6e964c6546cbbb10fff697f6227554eba716b2a1df74f7c2613d95')
|
||||
|
||||
prepare() {
|
||||
cd $pkgbase-$pkgver/
|
||||
|
|
@ -54,7 +54,7 @@ prepare() {
|
|||
patch -Np1 < ../0007-systemd-service-add-instance-name-in-description.patch
|
||||
|
||||
if [[ $CARCH == arm || $CARCH == armv6h ]]; then
|
||||
patch -p0 -i ../atomic.patch
|
||||
patch -p1 -i ../0001-libatomic.patch
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
--- libmysqld/CMakeLists.txt.orig 2019-06-17 16:00:31.000000000 -0600
|
||||
+++ libmysqld/CMakeLists.txt 2019-06-27 12:22:55.490388083 -0600
|
||||
@@ -154,6 +154,7 @@
|
||||
${LIBWRAP} ${LIBCRYPT} ${LIBDL}
|
||||
${MYSQLD_STATIC_PLUGIN_LIBS}
|
||||
sql_embedded
|
||||
+ atomic
|
||||
)
|
||||
|
||||
# Some storage engine were compiled for embedded specifically
|
||||
--- sql/CMakeLists.txt.orig 2019-06-17 16:00:32.000000000 -0600
|
||||
+++ sql/CMakeLists.txt 2019-06-27 12:22:55.490388083 -0600
|
||||
@@ -181,7 +181,8 @@
|
||||
${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
|
||||
${WSREP_LIB}
|
||||
${SSL_LIBRARIES}
|
||||
- ${LIBSYSTEMD})
|
||||
+ ${LIBSYSTEMD}
|
||||
+ atomic)
|
||||
|
||||
IF(WIN32)
|
||||
SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
|
||||
--- storage/rocksdb/build_rocksdb.cmake.orig 2019-06-27 12:22:49.450397299 -0600
|
||||
+++ storage/rocksdb/build_rocksdb.cmake 2019-06-27 12:22:55.494388077 -0600
|
||||
@@ -448,7 +448,7 @@
|
||||
list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
|
||||
|
||||
ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
|
||||
-target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
|
||||
+target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS} atomic)
|
||||
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp")
|
||||
endif()
|
||||
Loading…
Reference in a new issue