From patchwork Sat Mar 25 04:07:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 48660 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 6FE3716FFD; Sat, 25 Mar 2023 04:33:18 +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=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 53D8716FFB for ; Sat, 25 Mar 2023 04:33:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pfvaT-0003W1-D0; Sat, 25 Mar 2023 00:33:05 -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 1pfvaR-0003Vn-A9 for guix-patches@gnu.org; Sat, 25 Mar 2023 00:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pfvaQ-0001Lr-TD for guix-patches@gnu.org; Sat, 25 Mar 2023 00:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pfvaQ-0007oe-9C for guix-patches@gnu.org; Sat, 25 Mar 2023 00:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62431] [PATCH] gnu: libjxr: fix cross-build. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Mar 2023 04:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62431 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62431@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167971876230015 (code B ref -1); Sat, 25 Mar 2023 04:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2023 04:32:42 +0000 Received: from localhost ([127.0.0.1]:41833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfva3-0007o1-EL for submit@debbugs.gnu.org; Sat, 25 Mar 2023 00:32:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:33940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pfvZv-0007ng-0o for submit@debbugs.gnu.org; Sat, 25 Mar 2023 00:32:38 -0400 Received: from [2001:470:142:3::10] (helo=eggs.gnu.org) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1pfvCx-0006r7-0o for guix-patches@gnu.org; Sat, 25 Mar 2023 00:08:47 -0400 Received: from out162-62-57-49.mail.qq.com ([162.62.57.49]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1pfvCs-0001zw-Lc for guix-patches@gnu.org; Sat, 25 Mar 2023 00:08:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1679717311; bh=uv9Co8+Hg6wXgQPk7tTWccPMPO87CpoBRongZoD8NQQ=; h=From:To:Subject:Date; b=GIYbWMy0tVtP6cf0iY6hQ0V4MtxfsNceYAUA3XovFpI6waAFVHqo8wKusJ1Cimst4 pysxdhd4Y+LYWbn/HjNFcRqhsITgxYA/IYdZaK8J1k5w5IzG9XP0XoUHx8u7IOBHCe SlCmbmnMqRQFr/S7WuVCQJ34f3aiFQQwHga3mv1A= Received: from localhost.localdomain ([112.10.199.221]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 1C28F0F6; Sat, 25 Mar 2023 12:07:02 +0800 X-QQ-mid: xmsmtpt1679717222t11dp253f Message-ID: X-QQ-XMAILINFO: MZ4XH1L85f1rWXL9NfdJZHPnm/NAaPgeVzSAorupnzHGUnXQFsOk3BElOYQJYn PrEdISXPQHKuBj8L+OWbdshoqUruHjWbUOY/nQiaR/HHbyO2mUs+PKfxJwUInspdlczWDNzAd0jr M1e9WCqCjbH0Ff6WfKq6Cn8G9GlQ2onLsb0610sCYg9dETpjO5QRHv4KGzzxC4Q8kjw1Hl/lnNSV 4xoruoCEWOfAm+sJkCYuZIp+64mvmLnDj5oSy87vR/hbhEbhovdzw1NVSLqudpDMz5GX3l5PlWqN QXvKaoNHuRO5ZZ8fDP+MyIX5UXErtgRZb1kTImY5BYw4B/44zZRizWj7YnMd7dbkxnfzGybLaS9y jFnGsKYaomcIhUwm+iNjmyFai6t/ZqtFgX4PJKRjKe4cnsY0LtWNN6zrf3iHrND6cbkyMZYBbGno L8sZRHUGHaLlRdheCqM4ua7ROWLJ+CgEm8zB/EqPO9GTykqkdbHPuUYfgGbcZCirkKH5vfvSjiaq iQGjcPd02+Dt7GYZJyfyCVU1DoBqdKp7NW8MIXsv7lyJh5cOmi+xKfikHG29lYnJ8avutmX8uGpK qGthjpCBHhpClIP6VoYxr/cOgM5H8t14eg7/hRovffpjoMGyBmFwZXk+zVv0Z3KJEZBPIC2qZHA8 kTqDMtWI/nAs6ovx//BmmcAyk3x1oYSw29ejqkeumR7pVoFC5xCdeUu4OEGH7C5HgnDyzkQ279lS Yb/cPL0SiY6HnpM3jZyphYwHNM1QXqAks19OeGq+AHAJi5zOUiKLtR5rWL5mEHRVVbEA8CbZkQ/n uvio/sEms+p4kaXZvINukUGNdE6TD8f225nvz0N68s3SJgkFwXAzIlS0qjg7s5e24NRe9JZ7XGUA N3dLTfXAQJIak4vBILtI7N66xNeA9yZ16wLpq3vN14BXjc5iEsJLLjpRT3eDtkQQ== Date: Sat, 25 Mar 2023 12:07:01 +0800 X-OQ-MSGID: <7364c5db083c2fe00dd1098df3e7bbd3cc43dafb.1679717211.git.873216071@qq.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=162.62.57.49; envelope-from=873216071@qq.com; helo=out162-62-57-49.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> 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 (libjxr): fix cross-build. [arguments]:<#:phases>:build-shared-library: use cc-for-target replace "gcc" --- gnu/packages/image.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0709c793b1..0da990e63a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 ( ;;; Copyright © 2022-2023 Bruno Victal +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -458,7 +459,7 @@ (define-public libjxr (lambda _ ;; The Makefile uses optimization level 1, so the same ;; level is used here for consistency. - (invoke "gcc" "-shared" "-fPIC" "-O" + (invoke ,(cc-for-target) "-shared" "-fPIC" "-O" ;; Common files. "adapthuff.o" "image.o" "strcodec.o" "strPredQuant.o" "strTransform.o" "perfTimerANSI.o" @@ -469,7 +470,7 @@ (define-public libjxr "encode.o" "segenc.o" "strenc.o" "strFwdTransform.o" "strPredQuantEnc.o" "-o" "libjpegxr.so") - (invoke "gcc" "-shared" "-fPIC" "-O" + (invoke ,(cc-for-target) "-shared" "-fPIC" "-O" ;; Glue files. "JXRGlue.o" "JXRMeta.o" "JXRGluePFC.o" "JXRGlueJxr.o" ;; Test files.