mbakke pushed a commit to branch core-updates in repository guix. commit 1ea1ce18ade18468e4c00a23ccfa75197c3b62ad Author: Marius Bakke <mba...@fastmail.com> Date: Wed Jul 3 15:41:21 2019 +0200
gnu: sdl2: Fix FTBFS with GCC7. * gnu/packages/sdl.scm (sdl2)[arguments]: Add <#:make-flags>. --- gnu/packages/sdl.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index b6b28b7..c012dbc 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus <rek...@elephly.net> ;;; Copyright © 2019 Kei Kebreau <kkebr...@posteo.net> ;;; Copyright © 2019 Nicolas Goaziou <m...@nicolasgoaziou.fr> +;;; Copyright © 2019 Marius Bakke <mba...@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,6 +122,15 @@ joystick, and graphics hardware.") ((#:configure-flags flags) `(append '("--disable-wayland-shared" "--enable-video-kmsdrm" "--disable-kmsdrm-shared") + ,flags)) + ((#:make-flags flags ''()) + ;; Add the Fcitx header files to GCCs "system header" search path + ;; in order to suppress compiler warnings induced by those: + ;; .../include/fcitx-utils/utarray.h:178:9: error: ISO C90 forbids + ;; mixed declarations and code [-Werror=declaration-after-statement] + `(append (list (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "fcitx") + "/include")) ,flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems