me
/
guix
Archived
1
0
Fork 0
Code

gnu: mariadb: Move GCC ICE patch to the usual location. 

* gnu/packages/databases.scm (mariadb)[source](patches): New field.
[arguments]: Don't disable semisync plugin.
[inputs]: Remove 'mariadb-gcc-ice.patch'.
master
Marius Bakke 2018-07-28 18:37:37 +02:00
parent 1af575f04d
commit 0333582477
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/databases.scm
View File

@ -636,6 +636,7 @@ Language.")
(sha256 (sha256
(base32 (base32
"0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67"))
(patches (search-patches "mariadb-gcc-ice.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -684,17 +685,6 @@ Language.")
"-DINSTALL_SHAREDIR=share") "-DINSTALL_SHAREDIR=share")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Apply this patch that's only needed on ARM.
,@(if (and (not (%current-target-system))
(string=? "armhf-linux" (%current-system)))
`((add-after 'unpack 'apply-patch
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch (assoc-ref inputs "gcc-ice-patch")))
(invoke "patch" "-p1" "--force"
"--input" patch)
#t))))
'())
(add-after 'unpack 'unbundle (add-after 'unpack 'unbundle
(lambda _ (lambda _
;; The bundled PCRE in MariaDB has a patch that was upstreamed ;; The bundled PCRE in MariaDB has a patch that was upstreamed
@ -746,10 +736,7 @@ Language.")
"/CMakeLists.txt") "/CMakeLists.txt")
(lambda (port) (lambda (port)
(format port "\n"))))) (format port "\n")))))
(disabled-plugins '(;; FIXME: On armhf-linux, this plugin (disabled-plugins '(;; XXX: Causes a test failure.
;; triggers a GCC ICE. Disable for now.
"semisync"
;; XXX: Causes a test failure.
"disks"))) "disks")))
(for-each disable-plugin disabled-plugins) (for-each disable-plugin disabled-plugins)
#t))) #t)))
@ -782,10 +769,7 @@ Language.")
#t)))))) #t))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("perl" ,perl) ("perl" ,perl)))
,@(if (string=? "armhf-linux" (%current-system))
`(("gcc-ice-patch" ,(search-patch "mariadb-gcc-ice.patch")))
'())))
(inputs (inputs
`(("jemalloc" ,jemalloc) `(("jemalloc" ,jemalloc)
("libaio" ,libaio) ("libaio" ,libaio)