M gnu/local.mk => gnu/local.mk +0 -1
@@ 1863,7 1863,6 @@ dist_patch_DATA = \
%D%/packages/patches/mandoc-support-zstd-compression.patch \
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/makem-replace-git.patch \
- %D%/packages/patches/mariadb-rocksdb-atomic-linking.patch \
%D%/packages/patches/marisa-fix-MARISA_WORD_SIZE.patch \
%D%/packages/patches/mathjax-disable-webpack.patch \
%D%/packages/patches/mathjax-no-a11y.patch \
M gnu/packages/databases.scm => gnu/packages/databases.scm +3 -15
@@ 1,6 1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2016, 2018, 2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2025 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2017 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org>
@@ 1240,14 1240,6 @@ Language.")
#:parallel-tests? ,(target-x86-64?)
#:phases
(modify-phases %standard-phases
- ;; TODO: Move this patch to the source field.
- ,@(if (target-riscv64?)
- `((add-after 'unpack 'patch-source
- (lambda* (#:key inputs native-inputs #:allow-other-keys)
- (invoke "patch" "-p1" "--force" "--input"
- (assoc-ref (or native-inputs inputs)
- "patch-file")))))
- '())
(add-after 'unpack 'adjust-output-references
(lambda _
;; The build system invariably prepends $CMAKE_INSTALL_PREFIX
@@ 1388,12 1380,8 @@ Language.")
(("-lssl -lcrypto" all)
(string-append "-L" openssl " " all)))))))))
(native-inputs
- `(,@(if (target-riscv64?)
- `(("patch" ,patch)
- ("patch-file" ,(search-patch "mariadb-rocksdb-atomic-linking.patch")))
- `())
- ("bison" ,bison)
- ("perl" ,perl)))
+ `(("bison" ,bison)
+ ("perl" ,perl)))
(inputs
(list fmt
jemalloc
D gnu/packages/patches/mariadb-rocksdb-atomic-linking.patch => gnu/packages/patches/mariadb-rocksdb-atomic-linking.patch +0 -54
@@ 1,54 0,0 @@
-https://github.com/MariaDB/server/pull/2477
-https://github.com/MariaDB/server/commit/195c0e81493c41f1d20b91a5bcc6aaaf4979d781.patch
-
-From 195c0e81493c41f1d20b91a5bcc6aaaf4979d781 Mon Sep 17 00:00:00 2001
-From: Daniel Black <daniel@mariadb.org>
-Date: Fri, 3 Feb 2023 11:51:20 +1100
-Subject: [PATCH] MDEV-30554 RockDB libatomic linking on riscv64
-
-The existing storage/rocksdb/CMakeCache.txt defined
-ATOMIC_EXTRA_LIBS when atomics where required. This was
-determined by the toplevel configure.cmake test
-(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC).
-
-As build_rocksdb.cmake is included after ATOMIC_EXTRA_LIBS
-was set, we just need to use it. As such no riscv64
-specific macro is needed in build_rocksdb.cmake.
-
-As highlighted by Gianfranco Costamagna (@LocutusOfBorg)
-in #2472 overwriting SYSTEM_LIBS was problematic.
-This is corrected in case in future SYSTEM_LIBS is changed
-elsewhere.
-
-Closes #2472.
----
- storage/rocksdb/build_rocksdb.cmake | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
-index e23862ee65901..647e51e2f90d9 100644
---- a/storage/rocksdb/build_rocksdb.cmake
-+++ b/storage/rocksdb/build_rocksdb.cmake
-@@ -129,10 +129,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
- ADD_DEFINITIONS(-DHAVE_POWER8 -DHAS_ALTIVEC)
- endif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
-
--if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
-- set(SYSTEM_LIBS ${SYSTEM_LIBS} -latomic)
--endif()
--
- option(WITH_FALLOCATE "build with fallocate" ON)
-
- if(WITH_FALLOCATE AND UNIX)
-@@ -161,9 +157,9 @@ include_directories(SYSTEM ${ROCKSDB_SOURCE_DIR}/third-party/gtest-1.7.0/fused-s
-
- find_package(Threads REQUIRED)
- if(WIN32)
-- set(SYSTEM_LIBS ${SYSTEM_LIBS} Shlwapi.lib Rpcrt4.lib)
-+ set(SYSTEM_LIBS ${SYSTEM_LIBS} ${ATOMIC_EXTRA_LIBS} Shlwapi.lib Rpcrt4.lib)
- else()
-- set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${CMAKE_DL_LIBS})
-+ set(SYSTEM_LIBS ${SYSTEM_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${CMAKE_DL_LIBS} ${ATOMIC_EXTRA_LIBS})
- endif()
-
- set(ROCKSDB_LIBS rocksdblib})