From patchwork Fri Mar 29 17:01:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 62357 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 04CAA27BBEA; Fri, 29 Mar 2024 17:03:36 +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 C912827BBE9 for ; Fri, 29 Mar 2024 17:03:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqFdR-0008Ry-Ul; Fri, 29 Mar 2024 13:03:22 -0400 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 1rqFd8-0008N8-Cr for guix-patches@gnu.org; Fri, 29 Mar 2024 13:03:03 -0400 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 1rqFd7-0000dW-0G for guix-patches@gnu.org; Fri, 29 Mar 2024 13:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqFd8-00042S-2W for guix-patches@gnu.org; Fri, 29 Mar 2024 13:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70079] [PATCH] gnu: libjxl: Fix building on riscv64-linux. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Mar 2024 17:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70079 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70079@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171173172515358 (code B ref -1); Fri, 29 Mar 2024 17:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Mar 2024 17:02:05 +0000 Received: from localhost ([127.0.0.1]:43324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqFcC-0003zd-Dp for submit@debbugs.gnu.org; Fri, 29 Mar 2024 13:02:05 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqFc8-0003yX-Dt for submit@debbugs.gnu.org; Fri, 29 Mar 2024 13:02:02 -0400 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 1rqFbv-0007oS-Lg for guix-patches@gnu.org; Fri, 29 Mar 2024 13:01:51 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] 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 1rqFbs-0000VW-6g for guix-patches@gnu.org; Fri, 29 Mar 2024 13:01:47 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.22]) by APP-03 (Coremail) with SMTP id rQCowAAnSCXi8wZmJoUFAA--.1407S2; Sat, 30 Mar 2024 01:01:23 +0800 (CST) From: Zheng Junjie Date: Sat, 30 Mar 2024 01:01:16 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: rQCowAAnSCXi8wZmJoUFAA--.1407S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 0_Cr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r4UJwAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; 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 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]: When target riscv64, add 'add-miss-atomic-include phase. Change-Id: I554ae8d9d9bd982e7eb63ad4ecae176d2ba2372b --- gnu/packages/image.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) base-commit: 37d31495c1c3c38d1b74e0c5b3ba279c1d99c7d5 diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6accf68ef0..35ee12d8f3 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 ( ;;; Copyright © 2022-2023 Bruno Victal -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023-2024 Nicolas Goaziou ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2024 chris @@ -2606,7 +2606,17 @@ (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") + ;; see https://github.com/libjxl/libjxl/pull/2211 + ,@(if (target-riscv64?) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-miss-atomic-include + (lambda _ + (substitute* "lib/jxl/enc_xyb.cc" + (("") + "\n#include ")))))) + '()))) (native-inputs (list asciidoc doxygen googletest pkg-config python)) (inputs