From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GDYNGM+/+WWlTgEAe85BDQ:P1 (envelope-from ) for ; Tue, 19 Mar 2024 17:39:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id GDYNGM+/+WWlTgEAe85BDQ (envelope-from ) for ; Tue, 19 Mar 2024 17:39:43 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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-Seal: i=1; s=key1; d=yhetil.org; t=1710866383; a=rsa-sha256; cv=none; b=XutgQ5KmRIHpZVz8JPsYywpqhZeulxnjFIFha2tb1bPLTv+sqSXZq5//QBfA1qyqmoPr7C vPXiKNgnan+n0zS7z9ovi4hAZwaHSp19V0PyQHIHdAyWwnlXI1f1C9I9SstOr1G7vFguzD XeOj3eMm30HNZ2R+J2z6eURkWMH8s7ZMJHUSA+LHCRUPGsupD6HMb4qZGeqLTL8KWaw+19 Vngp5pN8+FpIVmGYRkwnHsd1RFnwwkWhP1AqiCnKsNVsL3PNG47NBSLx6Zv8Tc7T2OW6Kf uziy6qBA77R/5vh1FKM/EmIgT2Vn+3k2gxO87Q3XTKZx/6j5eKvevQx/1SrNtg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=1710866383; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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; bh=4brAlhjDXwJHGMUl4+FRQaHdoNPiDe1U2YzS+3kRB3Q=; b=mWAe1g1j5v/BNnlQI+vzsTHX2SuUb88rPlKfN7gnAXshro9tm+nnFPh6LmkU4wDdPEB4G8 JlBr47kC0W54xlsOaKrG2xE4d7c6RpXsgeWp42jzNmOiRlV3K8603m+NxpmwMSLvowD//Z f2vc/HzXK3Eye14xqgRZgMpVxTFjpWoQ4hvf99S3RD1FpQqQFBIlzMJppDSduKVS0xaBsW 4Q82KpFEC1+WSpExZPCRBlR9t08vHqZFHOAXNqg11njWTY31inbTbBGBVKW1c6WnU4BgPe +R8L889K49hITa2ziZybnkMysYxtNoGsvlFPMNV0CL8KF+vESq4q2V+72r16yg== 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 242FE711EA for ; Tue, 19 Mar 2024 17:39:43 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmcUo-0005Kr-GF; Tue, 19 Mar 2024 12:39:26 -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 1rmcUn-0005K6-6G for guix-patches@gnu.org; Tue, 19 Mar 2024 12:39:25 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmcUm-0007j4-UE for guix-patches@gnu.org; Tue, 19 Mar 2024 12:39:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rmcVP-0007JF-KI for guix-patches@gnu.org; Tue, 19 Mar 2024 12:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69900] [PATCH 1/2] gnu: utf8proc: fix cross-compilation. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Mar 2024 16:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69900 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69900@debbugs.gnu.org Received: via spool by 69900-submit@debbugs.gnu.org id=B69900.171086635827896 (code B ref 69900); Tue, 19 Mar 2024 16:40:03 +0000 Received: (at 69900) by debbugs.gnu.org; 19 Mar 2024 16:39:18 +0000 Received: from localhost ([127.0.0.1]:51276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmcUf-0007Fm-SF for submit@debbugs.gnu.org; Tue, 19 Mar 2024 12:39:18 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:36216 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmcUY-0007FF-Bk for 69900@debbugs.gnu.org; Tue, 19 Mar 2024 12:39:14 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.22]) by APP-05 (Coremail) with SMTP id zQCowAB3faF8v_ll2AVEBw--.21528S2; Wed, 20 Mar 2024 00:38:20 +0800 (CST) From: Zheng Junjie Date: Wed, 20 Mar 2024 00:38:16 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAB3faF8v_ll2AVEBw--.21528S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 0_Cr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r4UJwAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU7LZ2DUUUU X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -5.31 X-Spam-Score: -5.31 X-Migadu-Queue-Id: 242FE711EA X-TUID: KhW68iH20YP3 * gnu/packages/textutils.scm (utf8proc): fix cross-compilation. [arguments]<#:make-flags>: Use CC-FOR-TARGET. <#:phases>: When cross-compilation, Get test data from native-inputs. Change-Id: I42699e62f28585cc215a8843b5daad9c52af44c9 --- gnu/packages/textutils.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 25de916fcb..b4855392d6 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2022 Gabriel Wicki ;;; Copyright © 2023 Reza Housseini ;;; Copyright © 2023 Hilton Chain -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Timotej Lazar ;; ;;; Copyright © 2024 Sharlatan Hellseher ;;; @@ -197,15 +197,20 @@ (define-public utf8proc ;; For tests. ("perl" ,perl)))) (arguments - '(#:make-flags (list "CC=gcc" + `(#:make-flags (list ,(string-append "CC=" (cc-for-target)) (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'check 'check-data - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key ,@(if (%current-target-system) + '(native-inputs) + '()) + inputs #:allow-other-keys) (for-each (lambda (i) - (copy-file (assoc-ref inputs i) + (copy-file (assoc-ref ,@(if (%current-target-system) + '((or native-inputs inputs)) + '(inputs)) i) (string-append "data/" i))) '("NormalizationTest.txt" "GraphemeBreakTest.txt")) (substitute* "data/GraphemeBreakTest.txt" -- 2.41.0