GNU bug report logs - #68040
[PATCH] gnu: libjxl: Fix build on riscv64-linux.

Previous Next

Package: guix-patches;

Reported by: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>

Date: Tue, 26 Dec 2023 12:46:01 UTC

Severity: normal

Tags: patch

To reply to this bug, email your comments to 68040 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#68040; Package guix-patches. (Tue, 26 Dec 2023 12:46:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Zheng Junjie <zhengjunjie <at> iscas.ac.cn>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Tue, 26 Dec 2023 12:46:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: libjxl: Fix build on riscv64-linux.
Date: Tue, 26 Dec 2023 20:43:18 +0800

* gnu/packages/image.scm (libjxl)
[arguments]: Add fix-atomic phase when target riscv64-linux.

Change-Id: I442c668c3d52c241f0d405f51ea8d995bfefd3fd
---
 gnu/packages/image.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index ebabd1c973..babaf9e625 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -2547,7 +2547,16 @@ (define-public libjxl
              "-DJPEGXL_FORCE_SYSTEM_BROTLI=true"
              "-DJPEGXL_FORCE_SYSTEM_LCMS2=true"
              "-DJPEGXL_FORCE_SYSTEM_HWY=true"
-             "-DJPEGXL_BUNDLE_LIBPNG=false")))
+             "-DJPEGXL_BUNDLE_LIBPNG=false")
+       ,@(if (target-riscv64?)
+             '(#:phases
+               (modify-phases %standard-phases
+                 (add-after 'unpack 'fix-atomic
+                   (lambda _
+                     (substitute* "lib/jxl/enc_xyb.cc"
+                       (("#include \"lib/jxl/enc_xyb.h\"" a)
+                        (string-append a "\n#include <atomic>")))))))
+             '())))
     (native-inputs
      (list asciidoc doxygen googletest pkg-config python))
     (inputs

base-commit: 0d13d095420861022e68e87ceebd5e037e12a8b3
-- 
2.41.0
This bug report was last modified 1 year and 173 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.