From 0333582477bfd1160a640bd35d08f59feaada607 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 28 Jul 2018 18:37:37 +0200
Subject: 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'.
---
 gnu/packages/databases.scm | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index cbc5ffc2c6..bd5102e027 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -636,6 +636,7 @@ (define-public mariadb
               (sha256
                (base32
                 "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67"))
+              (patches (search-patches "mariadb-gcc-ice.patch"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -684,17 +685,6 @@ (define-public mariadb
          "-DINSTALL_SHAREDIR=share")
        #: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
            (lambda _
              ;; The bundled PCRE in MariaDB has a patch that was upstreamed
@@ -746,10 +736,7 @@ (define-public mariadb
                                                         "/CMakeLists.txt")
                                        (lambda (port)
                                          (format port "\n")))))
-                   (disabled-plugins '(;; FIXME: On armhf-linux, this plugin
-                                       ;; triggers a GCC ICE.  Disable for now.
-                                       "semisync"
-                                       ;; XXX: Causes a test failure.
+                   (disabled-plugins '(;; XXX: Causes a test failure.
                                        "disks")))
                (for-each disable-plugin disabled-plugins)
                #t)))
@@ -782,10 +769,7 @@ (define-public mariadb
               #t))))))
     (native-inputs
      `(("bison" ,bison)
-       ("perl" ,perl)
-       ,@(if (string=? "armhf-linux" (%current-system))
-             `(("gcc-ice-patch" ,(search-patch "mariadb-gcc-ice.patch")))
-             '())))
+       ("perl" ,perl)))
     (inputs
      `(("jemalloc" ,jemalloc)
        ("libaio" ,libaio)
-- 
cgit v1.2.3