From patchwork Tue Feb 28 08:33: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: 47482 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 7E76816BFB; Tue, 28 Feb 2023 08:35:50 +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 935D316C32 for ; Tue, 28 Feb 2023 08:35:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWvRy-0003iy-Vl; Tue, 28 Feb 2023 03:35:07 -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 1pWvRw-0003fw-7i for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:04 -0500 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 1pWvRv-0007b0-RF for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWvRv-0005Rs-Lb for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH 2/8] gnu: libxv: fix riscv64 cross-compile. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Feb 2023 08:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61865 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61865@debbugs.gnu.org Received: via spool by 61865-submit@debbugs.gnu.org id=B61865.167757324520807 (code B ref 61865); Tue, 28 Feb 2023 08:35:03 +0000 Received: (at 61865) by debbugs.gnu.org; 28 Feb 2023 08:34:05 +0000 Received: from localhost ([127.0.0.1]:49640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWvQz-0005PR-4e for submit@debbugs.gnu.org; Tue, 28 Feb 2023 03:34:05 -0500 Received: from out203-205-221-239.mail.qq.com ([203.205.221.239]:36881) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pWvQn-0005NB-0K for 61865@debbugs.gnu.org; Tue, 28 Feb 2023 03:33:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1677573223; bh=kIdHmV6/QNN1K/MJEdTJ5SgFJRUZy4cnLBnWWzPvU9M=; h=From:To:Subject:Date:In-Reply-To:References; b=wtBJ9Vxrufi4lB7PT/piX/zU/T93yKunAUUStFa3MxNWG+Mz9S2TknbCrcXL6kGPk Bl5/DOxgDnXiWcCAnm80jw6BWNZ5/PH8nzxorBqaGLCzz8yx4CpUwmuD6eZclqy5NL fX8+X9CGgrdyANhY7Dae0Wg+cp92PW9WyskmjNt4= Received: from localhost.localdomain ([111.0.51.52]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 868856C0; Tue, 28 Feb 2023 16:33:40 +0800 X-QQ-mid: xmsmtpt1677573222tkjscru6x Message-ID: X-QQ-XMAILINFO: NafziRg7Bx69AAV6Wkj4wy82OcXn/bGTAzNZXt43gWeVrxTbrwEIZenphgMzvy vsgkqX8e16U4bCSqMfgvF6yahOZLqCrzoqjUIw2ZwL1CteLm7GluxxyaclIyAACA35GJnSCWdbFz 9sday1k8YuwJhv+zOIjdbEUY/AIJT2xdto2e3oiFb6QYwtb1ZF05jPP97GUPmlTlzUG0hIwnIIsw y9XGYVTdyOd6CFZa0NzQ24iFc1ohsBg3UYyo2DLI8B8qr0JrQHk5Opm9RnS2tBwm+cs33uY8kfQ3 s48/uwq22N2j2P8k3aeD68kCDZODsoWTiRhnq8XtsM4yuWl2xY4QrBnihia6sgFYmk6BX8b8F2UQ xRUKm2Pto22Ezzftuzx74cm5IVkSYBIrcU2KddDQssrIRbmEr+b+re4KOSox0/CBoMyc5pdXnFJg IKzF3vvm1gFWEeZjMi97op+jQrCxPh8+G4msK+r6eOJ4khzkbuUAq1fHP0Goi1ynbSsBbXEOoGQy aW/yfxd9ix7/wtJtkcFb7SCvQMH2Rs7KT0F2Z+55k23QlhKVb404CP7rEhTNsPHqrPbQurll24rQ TCJlPMQxeRHJ1QJkIMkySWXbj1X1JAW9Y9G8nv3lyRw6JKWQGHIlbjJkCz/S/SEQHzzWeXu8Yp9Q YYPl57/tN+1TVIpjmky4abd2la4Rl0LvaECBowXEQjriaY9uI+SDrYK8Ogj8LroWt3657d/GNeUs adTZwqY/rYUUOjm/W7tj5e18KarohOQnNWQZ1uJ2TDzUH4VU47e+Ld7UXtpSCs0dXLoVDKtF701y Fuc9pJtYCgekGpyWl8UgxERyNGFeR9xQbgsX1M/WZiQ5Yr8l9UNh13sP7YrbQGyeUF040xnLG7G8 3e/zH3RWuN/VXC/7PnqIN6sKEYjQCgRXbbhQbzwuPCZCM6JapTHwiBjz9LaoQRkyFirJIDLEFa/i QAa1mg+bGiMbydW/YulZ5ER425i2Ll Date: Tue, 28 Feb 2023 16:33:34 +0800 X-OQ-MSGID: <6dc3c47bb3153eb55c9baf9451d71d99addc132f.1677572541.git.873216071@qq.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 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/xorg.scm(libxv): fix riscv64 cross-compile [arguments]: when target is riscv64, add phase to update config.{guess,sub} [native-inputs]: when target is riscv64, add config. --- gnu/packages/xorg.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 32be732eef..2b6f9fa369 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4696,13 +4696,29 @@ (define-public libxv "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '(,@(malloc0-flags) "--disable-static"))) + `(#:configure-flags '(,@(malloc0-flags) "--disable-static") + ,@(if (target-riscv64?) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.guess and config.sub. + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))))) + '()))) (propagated-inputs (list xorgproto)) (inputs (list libxext libx11)) (native-inputs - (list pkg-config)) + (append (if (target-riscv64?) + (list config) + '()) + (list pkg-config))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg XVideo Extension library") (description "Library for the X Video Extension to the X11 protocol.")