From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 KCPyK9yBfGTkNgEASxT56A (envelope-from ) for ; Sun, 04 Jun 2023 14:21:48 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AI6HK9yBfGTHagEA9RJhRA (envelope-from ) for ; Sun, 04 Jun 2023 14:21:48 +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 63F9C19616 for ; Sun, 4 Jun 2023 14:21:48 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5mjI-0001wW-Ex; 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 1q5mjG-0001ve-La for guix-patches@gnu.org; Sun, 04 Jun 2023 08:21:02 -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-0006rY-Ci 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-0007gX-7T for guix-patches@gnu.org; Sun, 04 Jun 2023 08:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH] gnu: libxtst: 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.168588120329388 (code B ref 61865); Sun, 04 Jun 2023 12:21:02 +0000 Received: (at 61865) by debbugs.gnu.org; 4 Jun 2023 12:20:03 +0000 Received: from localhost ([127.0.0.1]:45229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5miI-0007dl-H1 for submit@debbugs.gnu.org; Sun, 04 Jun 2023 08:20:02 -0400 Received: from mail-ej1-f47.google.com ([209.85.218.47]:45221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5miE-0007dJ-4s for 61865@debbugs.gnu.org; Sun, 04 Jun 2023 08:20:01 -0400 Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-97000a039b2so605607466b.2 for <61865@debbugs.gnu.org>; Sun, 04 Jun 2023 05:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685881192; x=1688473192; 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=z09ZrVF3Q/peA0LwClAM9Hjp8Gzz6LziVADU/woV1+o=; b=YtGH/eWIMutuBq8z8pZF+TukgXHY1hKhACuniXhisINdnhQbYr54GYGUII95XrwmqG gGDSm67ivQ+9IHjcSuNwJ2j3tkpjNN5jfdJ8WZGhllKt5yJc7icKKBAQBjGblv0XuIc3 zlSaPUC1OCg3mOoWg+EEM9Ho0/4OgIe2efCVKpqJkqRPl9QmJMrncIqVMNF+RY/WmdGD BJTHwREiWwknFAdpc/Q1cOJGaalvqM5USFTIPRxATU9xD+h6W2sO16BdkJvhmpGUrzym W5DcED1mxtI/R4tjMEZ+pS4dT+VoLeifn0ncD5/w3TZTvQe9syCYCL85gRfbwV/+lc8t 1KYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685881192; x=1688473192; 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=z09ZrVF3Q/peA0LwClAM9Hjp8Gzz6LziVADU/woV1+o=; b=kfr9zP3twU6sJVJn5FAqwyUTQU+uOjHrK3FXXblQHCFjKRaGtxCZm9H4FLBJhL9+L3 Q5gUcnOOLV3MCj+Jj+hsoR3EfHEn5iFGCfZ3tj+7jW3Jr1HmDnQmmwE7UE1KJT2TrU8I Uo1evo72+jw6A9gcGPa2pVhh06owO9eljlByESgQXJ8k4bOaden91j/hzhmLEgGMEqfE JnBrY34xIiQYBMaunRF8bwTx9Idpl8t+kE8DY7Bl8rjMui1yslC8F3Pgp1bZauhZgKb/ 17yGBIpRXjanUvcxWAx0SAD02ytrp2ne8agGgO/cFWwysbILJQXBwyxYxKiDEKSOxKSw nkEA== X-Gm-Message-State: AC+VfDwvDOhuyoYOooEk+FGnI+c90PcR4cnqS8Xlrgdn1jaJh9MCkSYH 3+LzpSS5SyoGWU9hkXdcZ5I= X-Google-Smtp-Source: ACHHUZ6VoeBEzK5SAZcHD9LFaeSfVpyqiAxSpeqcE3oLaCG2mAhyGjLznf7XAKAhGISaE+4KCpjwKg== X-Received: by 2002:a17:906:dac8:b0:966:634d:9d84 with SMTP id xi8-20020a170906dac800b00966634d9d84mr4196099ejb.20.1685881192035; Sun, 04 Jun 2023 05:19:52 -0700 (PDT) Received: from localhost ([2a02:ed3:913:500:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id qu25-20020a170907111900b00974530bb44dsm3002238ejb.183.2023.06.04.05.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jun 2023 05:19:51 -0700 (PDT) Date: Sun, 4 Jun 2023 15:19:45 +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="D4oj6EBsVxc87DdJ" 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=1685881308; a=rsa-sha256; cv=none; b=D8yHho/XiqOGMigAxgMIBFAw2JOZQPaw4SSVm/eH1EMcgg3HHGP6CUC8bQ633Ee6ihZFDg ANvwEUq5eXXU8uHG1ToyN8GuEPPq4q+LNlnXXnDV4ZBwxU/xU/GY6yQ4ZDEcSbbeMsrCKI SE4EUILEl/B4h/eoumtFoxfKvukLGwYPiX8JcihRfu4GZIvTbxonGwoRgbmZfuLDZuhfbE fkGvN6hodcANTD05vtnMw80D7DDM0/4+UzsWwmYLAVZ2aVDUTTZB5cRt1etUKX/pmU4LAL FNIt7P5Xfvrh+bMb8X9DiB/eOpj8B0RY5KE6mz8DO9uscjI5lasUuODPxxE4mQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="YtGH/eWI"; 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=1685881308; 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=z09ZrVF3Q/peA0LwClAM9Hjp8Gzz6LziVADU/woV1+o=; b=d92h/Ql32P/KlL20t6RFiUio/ly6K1YBuKhJKoETEao13nWMWrc+35/rsryx9uzYX1BaN2 b7dLoU+qciVSvEUyoBnGQNVnugYxmgl/uDO5g4FxCW4dkvjgcOeZjdca7UXPiROnc3OHnN txFKPFZf5RFilRsx0GuUrvl7RcrW/X7NRKF2ZWx1HEJEKc5uFo9Mh2Nd0jOjSxA+pJveGp VBkECyo6+v7SDzCz+JrFhRrzzlV1FWjsTdS4x8R7NskzeR1qEQupMLipihMpcjJKQ+ABqM Yn1JZGg3EAyXcvNyqJlqzMJnfadzJOdM7R8BlxpXPHmVqqkxmMsX2rup7BW9Jw== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="YtGH/eWI"; 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: 63F9C19616 X-TUID: l8AavHLOMZRG --D4oj6EBsVxc87DdJ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This patch I changed (target-riscv64?) to (and (target-riscv64?) (%current-target-system)) This way it only occurs when cross compiling. On Thu, Mar 30, 2023 at 10:46:03PM +0800, Z572 via Guix-patches via wrote: > * gnu/packages/xorg.scm(libxtst): 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 | 21 ++++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) >=20 > diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm > index 55c9b53e1d..7d5e7c6f9c 100644 > --- a/gnu/packages/xorg.scm > +++ b/gnu/packages/xorg.scm > @@ -4509,13 +4509,28 @@ (define-public libxtst > "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6")))) > (build-system gnu-build-system) > (arguments > - '(#:configure-flags '("--disable-static"))) > + `(#:configure-flags '("--disable-static") > + ,@(if (target-riscv64?) > + `(#:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'update-config > + (lambda* (#:key native-inputs inputs #:allow-other-ke= ys) > + (for-each (lambda (file) > + (install-file > + (search-input-file > + (or native-inputs inputs) > + (string-append "/bin/" file)) ".")) > + '("config.guess" "config.sub")))))) > + '()))) > (propagated-inputs > (list libxi xorgproto)) > (inputs > - (list libx11)) > + (list libx11)) > (native-inputs > - (list pkg-config)) > + `(,@(if (target-riscv64?) > + (list config) > + '()) > + ,pkg-config)) > (home-page "https://www.x.org/wiki/") > (synopsis "Xorg library for Xtest and Record extensions") > (description > --=20 > 2.39.2 >=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 --D4oj6EBsVxc87DdJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmR8gV4ACgkQQarn3Mo9 g1HaOBAAkep3yfyT51y0Jp4sh1iagtn6WALE8lhtC1aOedyKj0prn0HM2YAVgPaS gCk508van7yDyetXtZOdTwVrNaAyZ/9dZ/sNpIszF9rac6bU8JPaGwFad4xpctnQ KGrrZKEDKY2+G0f4qC6BYeCcXGW8cUohyfkJ9SOHq6yOTdCjUJVXjfAPb5H9Tfoe b8QOA8NPZi2ppd2dPz+xp+/3YDA/p4G0GbQ2L61aheO0dW0WuP6tuHA0SYZkkh/2 UcfLf7fpxRLWNQgl5AGXYtnCO/RZc7P3m5kOIDhF3tzQ3xzurWskBUQ2RMw0hSmk HMLU81Mm2Nowlo35YBrq5Ipl/4ri2gNFp9mSZdVyYtcSqa29KlxuYSo9XKLNERpm A9KbcTo0muWj+xXGi6xXrzvu383bxApXL3Hjc5UZ8Tua615QtEXI33ra8MiNsWzO Q35vMZpq46vjdE+xYGuJvhGMVu1/AJ04sDHlztez0hfkLmCXG2zywMIXTpgTjYMy O/z24siaBGfQSS9zPTwKytxLwJjl8ttM4vd/oojTbxUv7X5swseu3gt9cdzUR9sk AcJTypBvAuWgVgw6ZA9szF1ANVVL6LMsQE74o4tAh9jMVXJxS7QQrYfPuQtMYnTa T8H/yghFw1X1ZGKuPD75FRbPaJ3TLsxsEK7F3Jiw8j4hilUw7YA= =DhkY -----END PGP SIGNATURE----- --D4oj6EBsVxc87DdJ--