X-Loop: help-debbugs@HIDDEN
Subject: [bug#68040] [PATCH] gnu: libjxl: Fix build on riscv64-linux.
Resent-From: Zheng Junjie <zhengjunjie@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 26 Dec 2023 12:46:01 +0000
Resent-Message-ID: <handler.68040.B.170359470827915 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 68040
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 68040 <at> debbugs.gnu.org
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.170359470827915
(code B ref -1); Tue, 26 Dec 2023 12:46:01 +0000
Received: (at submit) by debbugs.gnu.org; 26 Dec 2023 12:45:08 +0000
Received: from localhost ([127.0.0.1]:56078 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rI6nz-0007F0-F6
for submit <at> debbugs.gnu.org; Tue, 26 Dec 2023 07:45:07 -0500
Received: from lists.gnu.org ([2001:470:142::17]:51788)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rI6nw-0006tG-V9
for submit <at> debbugs.gnu.org; Tue, 26 Dec 2023 07:45:05 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>)
id 1rI6ni-0007lj-Ss
for guix-patches@HIDDEN; Tue, 26 Dec 2023 07:44:51 -0500
Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn)
by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256)
(Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>)
id 1rI6nV-0001Xu-F7
for guix-patches@HIDDEN; Tue, 26 Dec 2023 07:44:50 -0500
Received: from localhost.localdomain (unknown [183.247.5.190])
by APP-01 (Coremail) with SMTP id qwCowAA3l0CkyYpl1J8hAQ--.50505S2;
Tue, 26 Dec 2023 20:40:05 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
Date: Tue, 26 Dec 2023 20:43:18 +0800
Message-ID: <d99269bcffc8a7e7165be8b24e39da1b7d225e98.1703594598.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: qwCowAA3l0CkyYpl1J8hAQ--.50505S2
X-Coremail-Antispam: 1UD129KBjvdXoWrZrWrZr4kKw1fZFWDJr43Jrb_yoWkGFXEka
97GFnaqr4xZw4UK3Z8XFn7KF93WF4xX3yxWa17Kr10kas5Xr45CFyDX3W8ZF45Wa1jg3WF
kFsrWryxXr1v9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT
9fnUUIcSsGvfJTRUUUbF8YjsxI4VWkCwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I
6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2
8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0
cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4
A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IE
w4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMc
vjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2Iq
xVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r
106r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AK
xVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7
xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_
GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8P5r7UUUUU==
X-Originating-IP: [183.247.5.190]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
Received-SPF: pass client-ip=159.226.251.21;
envelope-from=zhengjunjie@HIDDEN; helo=cstnet.cn
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001,
SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
* 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
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Zheng Junjie <zhengjunjie@HIDDEN> Subject: bug#68040: Acknowledgement ([PATCH] gnu: libjxl: Fix build on riscv64-linux.) Message-ID: <handler.68040.B.170359470827915.ack <at> debbugs.gnu.org> References: <d99269bcffc8a7e7165be8b24e39da1b7d225e98.1703594598.git.zhengjunjie@HIDDEN> X-Gnu-PR-Message: ack 68040 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 68040 <at> debbugs.gnu.org Date: Tue, 26 Dec 2023 12:46:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 68040 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 68040: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68040 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.