| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | extra/mariadb/PKGBUILD | 4 | ||||
| -rw-r--r-- | extra/mariadb/mariadb-10.6.5-atomic.patch | 47 |
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 79494c26..609d3fe7 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,8 +1,8 @@ # add -latomic where needed (i486) -# patch mainly from VoidLinux, applying on i486 as it seems to fail on i686 and pentium4 +# patch mainly from VoidLinux, applying on i486 only, as it seems to fail on i686 and pentium4 if [ "$CARCH" = 'i486' ]; then source+=('mariadb-10.6.5-atomic.patch') - sha256sums+=('f7b88c37191d59019684f0692b35b1cd37a6a83863cdc506489cb487bb8a97fb') + sha256sums+=('99ded7e667d8f90d263a8c3d21dc819c404f973a3eaf116620a5d2975bfaaec7') eval "$( declare -f prepare | \ sed ' diff --git a/extra/mariadb/mariadb-10.6.5-atomic.patch b/extra/mariadb/mariadb-10.6.5-atomic.patch index bd6307a1..189e4cd7 100644 --- a/extra/mariadb/mariadb-10.6.5-atomic.patch +++ b/extra/mariadb/mariadb-10.6.5-atomic.patch @@ -1,38 +1,7 @@ -diff -rauN mariadb-10.5.10/configure.cmake mariadb-10.5.10-atomic-patch/configure.cmake ---- mariadb-10.5.10/configure.cmake 2021-05-05 23:00:18.000000000 +0200 -+++ mariadb-10.5.10-atomic-patch/configure.cmake 2021-05-30 13:26:47.387151901 +0200 -@@ -865,7 +865,26 @@ - long long int *ptr= &var; - return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); - }" --HAVE_GCC_C11_ATOMICS) -+HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) -+IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) -+ SET(HAVE_GCC_C11_ATOMICS True) -+ELSE() -+ SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) -+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") -+ CHECK_CXX_SOURCE_COMPILES(" -+ int main() -+ { -+ long long int var= 1; -+ long long int *ptr= &var; -+ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); -+ }" -+ HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ SET(HAVE_GCC_C11_ATOMICS True) -+ ENDIF() -+ SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) -+ENDIF() -+ - - IF(WITH_VALGRIND) - SET(HAVE_valgrind 1) -diff -rauN mariadb-10.5.10/mysys/CMakeLists.txt mariadb-10.5.10-atomic-patch/mysys/CMakeLists.txt ---- mariadb-10.5.10/mysys/CMakeLists.txt 2021-05-05 23:00:19.000000000 +0200 -+++ mariadb-10.5.10-atomic-patch/mysys/CMakeLists.txt 2021-05-30 13:28:17.793904044 +0200 -@@ -181,6 +181,11 @@ +diff -rauN mariadb-10.6.5/mysys/CMakeLists.txt mariadb-10.6.5-atomic-patch/mysys/CMakeLists.txt +--- mariadb-10.6.5/mysys/CMakeLists.txt 2021-11-05 21:03:30.000000000 +0100 ++++ mariadb-10.6.5-atomic-patch/mysys/CMakeLists.txt 2021-12-05 14:25:31.517929493 +0100 +@@ -186,6 +186,11 @@ TARGET_LINK_LIBRARIES(mysys pthread) ENDIF() @@ -44,10 +13,10 @@ diff -rauN mariadb-10.5.10/mysys/CMakeLists.txt mariadb-10.5.10-atomic-patch/mys ADD_EXECUTABLE(thr_lock thr_lock.c) TARGET_LINK_LIBRARIES(thr_lock mysys) SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN") -diff -rauN mariadb-10.5.10/storage/rocksdb/build_rocksdb.cmake mariadb-10.5.10-atomic-patch/storage/rocksdb/build_rocksdb.cmake ---- mariadb-10.5.10/storage/rocksdb/build_rocksdb.cmake 2021-05-05 23:00:19.000000000 +0200 -+++ mariadb-10.5.10-atomic-patch/storage/rocksdb/build_rocksdb.cmake 2021-05-30 13:29:54.193990574 +0200 -@@ -498,6 +498,9 @@ +diff -rauN mariadb-10.6.5/storage/rocksdb/build_rocksdb.cmake mariadb-10.6.5-atomic-patch/storage/rocksdb/build_rocksdb.cmake +--- mariadb-10.6.5/storage/rocksdb/build_rocksdb.cmake 2021-11-05 21:03:31.000000000 +0100 ++++ mariadb-10.6.5-atomic-patch/storage/rocksdb/build_rocksdb.cmake 2021-12-05 14:25:31.517929493 +0100 +@@ -494,6 +494,9 @@ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) |