From ae04b3996be99c89142866afdbba5151099b2064 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Sat, 25 Mar 2023 12:51:34 +0800 Subject: [PATCH] gnu: jpegoptim: Fix cross-compiling to riscv64. * gnu/packages/image.scm (jpegoptim)[arguments]: When cross-compiling t riscv64, add phase to update-config-scripts. [native-inputs]: When cross-compiling to riscv64, add config. Signed-off-by: Efraim Flashner --- gnu/packages/image.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 830989da78..06ace23636 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -571,9 +571,27 @@ (define-public jpegoptim (sha256 (base32 "06f6d08xvmsiki4mc1qs985gsjqmsxx793a93b72y25q84wbg9x9")))) (build-system gnu-build-system) - (inputs (list libjpeg-turbo)) (arguments - '(#:tests? #f)) ; no tests + `(#:tests? #f ; no tests + ,@(if (and (target-riscv64?) + (%current-target-system)) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) "./tools")) + '("config.guess" "config.sub")))))) + '()))) + (inputs (list libjpeg-turbo)) + (native-inputs + (if (and (target-riscv64?) + (%current-target-system)) + (list config) + '())) (synopsis "Optimize JPEG images") (description "jpegoptim provides lossless optimization (based on optimizing