From patchwork Sat Mar 25 04:51:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 48662 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 1133F16FFD; Sat, 25 Mar 2023 04:52:23 +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 2E67A16FFB for ; Sat, 25 Mar 2023 04:52:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pfvsu-0003Xh-C7; Sat, 25 Mar 2023 00:52:08 -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 1pfvss-0003XA-Jt for guix-patches@gnu.org; Sat, 25 Mar 2023 00:52:06 -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 1pfvsr-0006uF-Bt for guix-patches@gnu.org; Sat, 25 Mar 2023 00:52:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pfvsp-0008Kp-7K for guix-patches@gnu.org; Sat, 25 Mar 2023 00:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62433] [PATCH] gnu: jpegoptim: fix riscv64 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:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62433 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62433@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167971991632010 (code B ref -1); Sat, 25 Mar 2023 04:52:03 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2023 04:51:56 +0000 Received: from localhost ([127.0.0.1]:41843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfvse-0008KB-O7 for submit@debbugs.gnu.org; Sat, 25 Mar 2023 00:51:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:56842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pfvsa-0008K0-17 for submit@debbugs.gnu.org; Sat, 25 Mar 2023 00:51:51 -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 <873216071@qq.com>) id 1pfvsY-0003WI-Qq for guix-patches@gnu.org; Sat, 25 Mar 2023 00:51:46 -0400 Received: from out203-205-251-73.mail.qq.com ([203.205.251.73]) 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 1pfvsV-0006so-RM for guix-patches@gnu.org; Sat, 25 Mar 2023 00:51:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1679719900; bh=v400QcjZTzL+lVkFxJiEUSzTt3umW5BKn+IdQmSWQnw=; h=From:To:Subject:Date; b=OQmEvUNXzGGVv2JSeOR6Y1suQBELPLVT1jYyZYlwexF40j0CoM1NxRiCz0oyFeBxN Wyapqfm2UDS7nVwLOl2X56j4FccqvrtaXa2wMeirQmUZnCG/MxvEVgeQ1PYeFOyqAq N4mR57dPA8i5FqCiS5qI+dly8l0EU+ZfLn1kVmuo= Received: from localhost.localdomain ([112.10.199.221]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id CE3306D1; Sat, 25 Mar 2023 12:51:35 +0800 X-QQ-mid: xmsmtpt1679719895t6yylcnpa Message-ID: X-QQ-XMAILINFO: ONr7k4eEIq5Pv5b3Je5B+yH49h1WvNatMbaqtb/5P5Z3D9yPCW8tE/pxx0Xc2r hFFo98YExu17/9npgf2+grbiVyjyJjigxAANVDKkMaITWxai1BWydgiBIz+9Zd23szGSVZwXp5mx mNpVPeS3c7K76DqjkB3E/4DwSHu+Bc/elAHPOJ/xb9jDYS0GBUCFnXfVjW3oJRxdvzTsnvKNXvww AbgzF01AIbwMOrqLoMdesHHNSuMBdoJCzRHmAYokv5fYDd8vTa3KZ0IuI7/AGKDIJjAnQZAVWTxY 25oyr4ojeYutTjWATMrnN2LY6PreWu9eeRdcesR6ls280I3qn2c9Fdq8J2ERnOqCXL+0Q91WJ11U SYI10eLqVXHDlbd00pxvLRkNmI9bS/NMquny7JTwFHmDHfCn9FXYDeE3prUFk81HIRnH/uLDyG4B +KO5DU07DvxaLrvTcBd+ogzsJvxVwvKxeNIhXOMXg2cTByfQLQATJ0WIp9X2B5G+vFE5vgQ0N+Qo nnyOQXlpEElbEprGvuZr+o9QKU+zCsu6mgApCW04jZxy2xrc29CJkiEZupKI9hV8R1nOdkL8D0YZ oKqwqcoABXyanD4lm1e+CWhjNKhXqP3ytrrWU4Lv/0ysBvufMVH0XCkntTIHcA+9DMTTxlZdMY5w Y++Z39iO1rrOqknJe7iplarocpyUJZKgNFYoqOb87OU5pQ0VQLe0w1XNDjMVIeYcnAoTrJvpA+sB I/F9WsdTHdwDaT8Glbu6uPyTicijJrURGxc7m9qI1aD73y5tY1Ud+w9Tw3lTBs6yw0IzPJm1RR8a YR7P5UOcH5vQBro7Bre2pApeEIEFlSf9fTv0tvM+7FR8997SZX9jiiPzlwpK11Sx2EJGLWRCipxb BRL8lv2RfPlhzNBO5mNaNevR8QMfA7/aBI06fpyfu4XEw4sglHETg= Date: Sat, 25 Mar 2023 12:51:34 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=203.205.251.73; envelope-from=873216071@qq.com; helo=out203-205-251-73.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 (jpegoptim): fix riscv64 cross-build. [arguments]: when target-riscv64, add phase to update-config-scripts [native-inputs]: when target-riscv64, add config. --- gnu/packages/image.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 81cdcd778e..3148ddee3c 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -526,8 +526,24 @@ (define-public jpegoptim (base32 "06f6d08xvmsiki4mc1qs985gsjqmsxx793a93b72y25q84wbg9x9")))) (build-system gnu-build-system) (inputs (list libjpeg-turbo)) + (native-inputs + (if (target-riscv64?) + (list config) + '())) (arguments - '(#:tests? #f)) ; no tests + `(#:tests? #f ; no tests + ,@(if (target-riscv64?) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) "./tools")) + '("config.guess" "config.sub")))))) + '()))) (synopsis "Optimize JPEG images") (description "jpegoptim provides lossless optimization (based on optimizing