diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-10 17:50:25 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-10 17:50:25 +0200 |
| commit | b859a1bf7953eb98668cb11b459cde48b0dce991 (patch) | |
| tree | 65a7528db80039309376d5d27e4c53742f3228af | |
| parent | e43e980f847564e46f96e09bf77c648c3ef98b3c (diff) | |
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.
| -rw-r--r-- | gnu/packages/databases.scm | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b969b8f081..f6c5ec90d7 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 |