aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-10-08 10:16:04 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-10-08 10:16:04 +0200
commit2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9 (patch)
tree3b68e8136f5231cbcd243c126ee1ce23cc7804c5
parent4d8d2fbaf3025337f7feff627282447db82a99d5 (diff)
downloadpatches-2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9.tar
patches-2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9.tar.gz
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.
-rw-r--r--gnu/packages/databases.scm5
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 7960b7087a..bb7adf25a6 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)