From 6c9e010283424498ca094e163f29c1156df13752 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Jun 2025 15:46:08 +0300 Subject: [PATCH] gnu: skia: Fix building on i686-linux. * gnu/packages/graphics.scm (skia)[arguments]: Adjust the 'configure and 'check phases to not hardcode gcc. [native-inputs]: When building for i686-linux add clang-toolchain. Change-Id: I8ca5e98992141bc5319f415f687c2828c675629a --- gnu/packages/graphics.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e6ddd21727b..d74415fb2b4 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2019, 2023, 2025 Ricardo Wurmus -;;; Copyright © 2016, 2018, 2021, 2023, 2024 Efraim Flashner +;;; Copyright © 2016, 2018, 2021, 2023-2025 Efraim Flashner ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017, 2018 Ben Woodcroft @@ -2355,7 +2355,7 @@ and engineering community.") (string-append ;; "--args=" - "cc=\"gcc\" " ;defaults to 'cc' + "cc=\"" #$(cc-for-target) "\" " ;defaults to 'cc' "is_official_build=true " ;to use system libraries "is_component_build=true " ;build as a shared library "skia_use_system_zlib=true " ; use system zlib library @@ -2451,7 +2451,7 @@ Cflags: -I${includedir}~%" #$output #$version))))) (invoke "gn" "gen" "out/Debug" (string-append "--args=" - "cc=\"gcc\" " ;defaults to 'cc' + "cc=\"" #$(cc-for-target) "\" " ;defaults to 'cc' "skia_compile_sksl_tests=false " ; disable some tests "skia_use_perfetto=false " ; disable performance tests "skia_use_wuffs=false " ; missing performance tool @@ -2544,9 +2544,13 @@ Cflags: -I${includedir}~%" #$output #$version))))) "gl" "lottie" "_" "_" "_" "_" "_" "ES2BlendWithNoTexture")) (format #t "test suite not run~%"))))))) - (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper - spirv-tools spirv-headers - icu4c-for-skia glu xorg-server-for-tests)) + (native-inputs + (append (if (target-x86-32?) + (list clang-toolchain) + '()) + (list gn libjpeg-turbo ninja pkg-config python-wrapper + spirv-tools spirv-headers + icu4c-for-skia glu xorg-server-for-tests))) (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) (home-page "https://skia.org/") (synopsis "2D graphics library")