amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mariadb: Remove patch.

Browse source 
This was apparently merged in version 10.4 and does not apply anymore.

* gnu/packages/patches/mariadb-rocksdb-atomic-linking.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister file.
* gnu/packages/databases.scm (mariadb)[arguments]<#:phases>{patch-source}:
Remove phase.
[native-inputs]: Remove patch and patch-file.

Change-Id: I6fcf4a1852d8abd1bdb29cd2a2fe96b19da602a9
This commit is contained in:
Andreas Enge 2025-08-11 10:39:36 +02:00
parent 5e4ef038eb
commit b67be4524e
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
3 changed files with 3 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/databases.scm
View file

@ -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