From patchwork Tue Dec 26 12:43:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 58079 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BE9BC27BBEA; Tue, 26 Dec 2023 12:46:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 91C3B27BBE2 for ; Tue, 26 Dec 2023 12:46:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rI6ot-0007yN-56; Tue, 26 Dec 2023 07:46:03 -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 ) id 1rI6ol-0007y0-IM for guix-patches@gnu.org; Tue, 26 Dec 2023 07:45:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rI6ol-00020E-9z for guix-patches@gnu.org; Tue, 26 Dec 2023 07:45:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rI6os-0000gG-4o for guix-patches@gnu.org; Tue, 26 Dec 2023 07:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68040] [PATCH] gnu: libjxl: Fix build on riscv64-linux. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 12:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68040 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68040@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@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 ) id 1rI6nz-0007F0-F6 for submit@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 ) id 1rI6nw-0006tG-V9 for submit@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 ) id 1rI6ni-0007lj-Ss for guix-patches@gnu.org; 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 ) id 1rI6nV-0001Xu-F7 for guix-patches@gnu.org; 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 Date: Tue, 26 Dec 2023 20:43:18 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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@iscas.ac.cn; 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 0d13d095420861022e68e87ceebd5e037e12a8b3 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 "))))))) + '()))) (native-inputs (list asciidoc doxygen googletest pkg-config python)) (inputs