01/01: gnu: mariadb: Build with GCC 5 on ARMv7.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9
Author: Marius Bakke <address@hidden>
Date:   Tue Oct 8 10:16:04 2019 +0200

    gnu: mariadb: Build with GCC 5 on ARMv7.
    
    Fixes <https://bugs.gnu.org/37605>.
    
    * gnu/packages/databases.scm (mariadb)[native-inputs]: Add GCC-5 when the
    current system is ARMv7.
---
 gnu/packages/databases.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 7960b70..bb7adf2 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -72,6 +72,7 @@
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
@@ -779,6 +780,10 @@ Language.")
               #t))))))
     (native-inputs
      `(("bison" ,bison)
+       ;; XXX: On armhf, use GCC 5 to work around <https://bugs.gnu.org/37605>.
+       ,@(if (string-prefix? "armhf" (%current-system))
+             `(("gcc", gcc-5))
+             '())
        ("perl" ,perl)))
     (inputs
      `(("jemalloc" ,jemalloc)