From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WEYwHd2BfGTJCwAASxT56A (envelope-from ) for ; Sun, 04 Jun 2023 14:21:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id gJsEHN2BfGTTnQAAG6o9tA (envelope-from ) for ; Sun, 04 Jun 2023 14:21:49 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 268A81943B for ; Sun, 4 Jun 2023 14:21:49 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5mjI-0001wq-Qz; Sun, 04 Jun 2023 08:21:04 -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 1q5mjH-0001vm-3Y for guix-patches@gnu.org; Sun, 04 Jun 2023 08:21: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 1q5mjG-0006ri-QH for guix-patches@gnu.org; Sun, 04 Jun 2023 08:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q5mjG-0007ge-Lo for guix-patches@gnu.org; Sun, 04 Jun 2023 08:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH 2/8] gnu: libxv: fix riscv64 cross-compile. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jun 2023 12:21:02 +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: Z572 <873216071@qq.com> Cc: 61865@debbugs.gnu.org Received: via spool by 61865-submit@debbugs.gnu.org id=B61865.168588120529405 (code B ref 61865); Sun, 04 Jun 2023 12:21:02 +0000 Received: (at 61865) by debbugs.gnu.org; 4 Jun 2023 12:20:05 +0000 Received: from localhost ([127.0.0.1]:45232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5miL-0007eC-04 for submit@debbugs.gnu.org; Sun, 04 Jun 2023 08:20:05 -0400 Received: from mail-ej1-f47.google.com ([209.85.218.47]:57712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5miJ-0007dQ-6e for 61865@debbugs.gnu.org; Sun, 04 Jun 2023 08:20:03 -0400 Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-969f90d71d4so553581566b.3 for <61865@debbugs.gnu.org>; Sun, 04 Jun 2023 05:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685881197; x=1688473197; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=gJMcTMY5uK0/FjBslJ6l3FaXu3BSZ1W1SjgWy/U2Hhs=; b=qbpjnsJHgEH19ZqBK4qqByAViLgPzHaDm2xbDMkKoPcVf+lRaLEOIfeEYWbsx3055a wcaIYe1SMfdiU0DKMV1u30gGloqcHWQLZF2BmPwobVtE9KhS1LizvcL2062QZdvztcYB BlysfaS2j5/PQQQuVDJO+G1sZWObDCCG/0/vO4RwupbbXskssgeenCxOvxMF8xgUklNr llO7N5dGit8mC/gueDOpeZqrkThu68d4U+e4r6QHo2ireQmIi4QwZtuxaXtqFl2UlDMC k9d2ljVx5h3oj+G/2U6JRQCh1bPG6Gp6706YjW7NYo8TKj/H0SKA4+YjZtX0ZEgHbNUX 3bCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685881197; x=1688473197; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gJMcTMY5uK0/FjBslJ6l3FaXu3BSZ1W1SjgWy/U2Hhs=; b=RnKAM0VAoNcRhtmc1lwE/y9JcvlGgMne62Ba4M9fa1mL8ylOAAqw09x2AGHkvpkMqo bdD0fjzsnY2nOuwfTWsmPVvWNaoOphpVulewc+m58roM3xFz4HK+6BGnwNJxNbnb6i5b dDVjsAkAJEhuCM8m/EPEoZkgpc/mtYH3vuYCTNLGrJ9i1WC96fecSpQ1naD5EqhS4vzO xbh46/bM4LVh7LDE8uoza29gRJW1tuwOQqEVDgSBJp/ik580Dsr3P6K01ERT27iH2+nJ OD62h5EMxKeRErCcLRCfh5UdBGRkDj8GLwd3U+mB2WFx7oM4wH1wDY97kTp4JffMtJld lArA== X-Gm-Message-State: AC+VfDzzKZFVchKp977soMHTm5dFWa4zs/vViSdBJT9tSvmawRLTEoOG IPBnlNEdg68JuIq4a8NMkK0= X-Google-Smtp-Source: ACHHUZ7L33P8DrzfrGrW9HH1fw7nKlx8RiMhZaa1avV0rzDvEWXO1AG1XQHfu8EcC8CrXiFyYDLahw== X-Received: by 2002:a17:907:7ea6:b0:96f:a39c:86d6 with SMTP id qb38-20020a1709077ea600b0096fa39c86d6mr3896595ejc.8.1685881197303; Sun, 04 Jun 2023 05:19:57 -0700 (PDT) Received: from localhost ([2a02:ed3:913:500:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id x17-20020a1709060a5100b009662c57b4ffsm3021057ejf.96.2023.06.04.05.19.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jun 2023 05:19:56 -0700 (PDT) Date: Sun, 4 Jun 2023 15:19:52 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Z572 <873216071@qq.com>, 61865@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="9MHbuR4HUhNfI0qP" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685881309; a=rsa-sha256; cv=none; b=QMcQ9NUdDmErmwUin4SHx4PF8LY5Uf3GZwBrAB0JlEiYHklgG9tDW/1/vnJtlBYt81C0yq EW756OjnEqraTexc6DaQ/ZZdl/e2i/6PU+qsdYBhbKYeAE1BTSANra8qlgxmsILklk+5hq uuyOkXYlzEQT3VBwLjkMGskSmf3uJeK1l2uc1AMjbyssEY4XrOGMxwAW7UOS9ybqkcqi5N OTyiYCyOvri+5t187znNrJvb9r8/B+zr9m/YIzf7E9kwleuG/fQFKFuwzeJyxAfR3QUmTS AHYX6rAULN/PxpejM1l1WY0FKBKamcw55JD2tOigdYyOwJ40eHzUNIoAXZfzPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=qbpjnsJH; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685881309; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=gJMcTMY5uK0/FjBslJ6l3FaXu3BSZ1W1SjgWy/U2Hhs=; b=joCT3q7LlkyOjdciMVGLUUzOnNBazbaJCAK4rxOxkOS6baDmM12o6pg+km5DsQrXhwqcKR wYaLXWbRvi6QUcs2UzUrurhq+i8U0ML8sov1P96poIAb7H+j2o5XtsCTDEzVJZaDblBcDq l9BVC8AH8/D2FGgq8zqnQas6z5xGlw2XqCNVQVJDEvtNJHTH9hTMy5nQBaGhThv7jKTes+ OMKAm48QST04Eo3ctxAoytO+Z4igkCE8UpFZ9H0+ZZ45wilqd76Rp1KbGpLiJnfnxN0hDu qoAHhDWC6ma4Js1p+4gQ7WAIosPpZs6HjnxMlMzI7PTN1uwUjL8LMFVDewHsVA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=qbpjnsJH; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -3.38 X-Spam-Score: -3.38 X-Migadu-Queue-Id: 268A81943B X-TUID: 3vdLfb+doTzL --9MHbuR4HUhNfI0qP Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This patch is no longer necessary after updating libxv to a newer version. On Tue, Feb 28, 2023 at 04:33:34PM +0800, Z572 via Guix-patches via wrote: > * gnu/packages/xorg.scm(libxv): fix riscv64 cross-compile > [arguments]: when target is riscv64, add phase to update config.{guess,su= b} > [native-inputs]: when target is riscv64, add config. > --- > gnu/packages/xorg.scm | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) >=20 > 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-ke= ys) > + ;; 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.= ") > --=20 > 2.39.1 >=20 >=20 >=20 >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --9MHbuR4HUhNfI0qP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmR8gWgACgkQQarn3Mo9 g1FQgw//T2ESeo1qUKR1xBk9IdGp4ovQb9dGQM0xUehu8Cb5KZz/mHEw8waV3dFX XSnbd9PLr9F4gl+xMD4FS/XNDVwKui2ZTIQRBI51ichI3VhlqAKSiiBn5gEIZ3hA L0WFX3yKtHG3nXNgYvDKXOZr6f5AkFu2Q4fz2VW/Girqsmm982OJbz341sCsffyU 06SNDZvpl9+Txw9Yx4CSQUohcaDU/0r0jVif4sSsWnLvW8g4AkbEOJ40QAFvjMxG Abj/6mZT5cng+4HrPhqPL7dy9iP5Fl9IyJ+G1SC/b4tbvQLB3WJS5SzTtQLkoOOK 2MieV7lErKCzcjrtYCNCbRWOF8brMs6/hIB4gP0f9PNORHUWge25MzIIArHRE1Yr 6YoxtKdKQcpmOS3udQseSSAbDf+3BKx0+dirJvVUfgqaGZwJMgO2X085Hl9tKgS2 nLZG8pnCPV1FUftU3ByFq1hKN77CgbXdOIWB+0o/ZdzmMOq1Sm9R0FnBuduYh/+v 4kf0gtPcyHXh9O40BVFrdto+HQK348OtOtr2KqUIKaTsStGaT/h1AHPJQuXb/2b9 1XE2WjpWn88xSYKuPHFMFCAFlSnlnnXnWMNP3pwMidr98aUgKOWjWPrVytZ0NyMs H1aDG9pr90bFW8th6PYoWjb9EsZJpyA48N91XvbDlR5TJIJrk7Q= =ovAF -----END PGP SIGNATURE----- --9MHbuR4HUhNfI0qP--