summaryrefslogtreecommitdiff
path: root/user/mariadb/ppchax.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-07-07 00:16:42 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-07-07 00:16:42 +0000
commit786e32e39ee8f5b809e89d63133749608b0c5710 (patch)
tree941b2375625479a25ec368f63e2375f88f72cf95 /user/mariadb/ppchax.patch
parent262e5405f607d5ef06be1eef5033cb80fbe58461 (diff)
downloadpackages-786e32e39ee8f5b809e89d63133749608b0c5710.tar.gz
packages-786e32e39ee8f5b809e89d63133749608b0c5710.tar.bz2
packages-786e32e39ee8f5b809e89d63133749608b0c5710.tar.xz
packages-786e32e39ee8f5b809e89d63133749608b0c5710.zip
user/mariadb: fix libedit, fix 32-bit PowerPC build
Diffstat (limited to 'user/mariadb/ppchax.patch')
-rw-r--r--user/mariadb/ppchax.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/user/mariadb/ppchax.patch b/user/mariadb/ppchax.patch
new file mode 100644
index 000000000..26ffb5189
--- /dev/null
+++ b/user/mariadb/ppchax.patch
@@ -0,0 +1,26 @@
+--- mariadb-10.4.6/configure.cmake.old 2019-06-17 22:00:31.000000000 +0000
++++ mariadb-10.4.6/configure.cmake 2019-07-06 23:21:57.705655766 +0000
+@@ -922,6 +922,10 @@
+ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+ HAVE_GCC_C11_ATOMICS)
++IF(NOT HAVE_GCC_C11_ATOMICS AND CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
++ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} atomic)
++ SET(HAVE_GCC_C11_ATOMICS 1)
++ENDIF()
+
+ IF(WITH_VALGRIND)
+ SET(HAVE_valgrind 1)
+--- mariadb-10.4.6/mysys/CMakeLists.txt.old 2019-06-17 22:00:32.000000000 +0000
++++ mariadb-10.4.6/mysys/CMakeLists.txt 2019-07-07 00:03:56.956394100 +0000
+@@ -91,6 +91,10 @@
+ TARGET_LINK_LIBRARIES(mysys pthread)
+ ENDIF()
+
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
++ TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ ADD_EXECUTABLE(thr_lock thr_lock.c)
+ TARGET_LINK_LIBRARIES(thr_lock mysys)
+ SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")