02/02: gnu: mariadb: Fix build on armhf-linux.

[guix-commits]

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

commit b859a1bf7953eb98668cb11b459cde48b0dce991
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Apr 10 17:50:25 2020 +0200

    gnu: mariadb: Fix build on armhf-linux.
    
    * gnu/packages/databases.scm (mariadb)[arguments]: When building for
    armhf-linux, add phase 'hide-default-gcc'.
    [native-inputs]: Distinguish GCC-5.
---
 gnu/packages/databases.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index b969b8f..f6c5ec9 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -774,6 +774,20 @@ Language.")
          "-DINSTALL_SHAREDIR=share")
        #:phases
        (modify-phases %standard-phases
+         ,@(if (string-prefix? "arm" (%current-system))
+               ;; XXX: Because of the GCC 5 input, we need to hide GCC 7 from
+               ;; CPLUS_INCLUDE_PATH so that its headers do not shadow GCC 5.
+               '((add-after 'set-paths 'hide-default-gcc
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((gcc (assoc-ref inputs "gcc")))
+                       (setenv "CPLUS_INCLUDE_PATH"
+                               (string-join
+                                (delete (string-append gcc "/include/c++")
+                                        (string-split (getenv 
"CPLUS_INCLUDE_PATH")
+                                                      #\:))
+                                ":"))
+                       #t))))
+               '())
          (add-after 'unpack 'fix-pcre-detection
            (lambda _
              ;; The bundled PCRE in MariaDB has a patch that was upstreamed
@@ -906,7 +920,7 @@ Language.")
      `(("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))
+             `(("gcc@5", gcc-5))
              '())
        ("perl" ,perl)))
     (inputs