From patchwork Mon Apr 22 05:29:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63291 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 24AE027BBE9; Mon, 22 Apr 2024 06:30:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 AD4EC27BBE2 for ; Mon, 22 Apr 2024 06:30:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rymFR-000298-5e; Mon, 22 Apr 2024 01:29:49 -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 1rymFP-00028m-Oz for guix-patches@gnu.org; Mon, 22 Apr 2024 01:29:47 -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 1rymFP-0001go-Gx for guix-patches@gnu.org; Mon, 22 Apr 2024 01:29:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rymFf-0004mw-7P for guix-patches@gnu.org; Mon, 22 Apr 2024 01:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70509] [PATCH 1/2] gnu: nspr: Fix cross-compilation. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Apr 2024 05:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70509 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70509@debbugs.gnu.org Received: via spool by 70509-submit@debbugs.gnu.org id=B70509.171376378918258 (code B ref 70509); Mon, 22 Apr 2024 05:30:03 +0000 Received: (at 70509) by debbugs.gnu.org; 22 Apr 2024 05:29:49 +0000 Received: from localhost ([127.0.0.1]:45475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rymFP-0004kC-Es for submit@debbugs.gnu.org; Mon, 22 Apr 2024 01:29:48 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:35154 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rymFM-0004j6-IF for 70509@debbugs.gnu.org; Mon, 22 Apr 2024 01:29:45 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.232]) by APP-03 (Coremail) with SMTP id rQCowABXeiyu9SVmfhIiBQ--.13800S2; Mon, 22 Apr 2024 13:29:18 +0800 (CST) From: Zheng Junjie Date: Mon, 22 Apr 2024 13:29:16 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: rQCowABXeiyu9SVmfhIiBQ--.13800S2 X-Coremail-Antispam: 1UD129KBjvdXoWrtr1kAFykXr45Aw1fXrWkZwb_yoWfJFb_C3 97JrsIqr4rXFWqka4rCanY9rn5tw4xAF40gF97KFn2yFyfXr18ZayDGrn3A3W5Ga15tF1f AFZ5WryUXr4F9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbFkYjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUCVW8JwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I 8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20x vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWU JVW8JbIYCTnIWIevJa73UjIFyTuYvjxU2YiiDUUUU X-Originating-IP: [111.0.51.232] 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/nss.scm (nspr)[arguments]<#:configure-flags>: When cross-compilation, Add HOST_CC=gcc. Change-Id: I337f217f153f8cc3a713906643d6fab9115056e9 --- gnu/packages/nss.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 14612d7ce9..a93406b9eb 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -71,7 +71,10 @@ (define-public nspr #~(list "--disable-static" "--enable-64bit" (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib")) + (assoc-ref %outputs "out") "/lib") + #$@(if (%current-target-system) + #~("HOST_CC=gcc") + #~())) ;; Use fixed timestamps for reproducibility. #:make-flags #~'("SH_DATE='1970-01-01 00:00:01'" ;; This is epoch 1 in microseconds. From patchwork Mon Apr 22 05:29:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63292 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 6D14527BBE2; Mon, 22 Apr 2024 06:30:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 84E9527BBEA for ; Mon, 22 Apr 2024 06:30:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rymFR-00029A-6u; Mon, 22 Apr 2024 01:29:49 -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 1rymFP-00028e-Bt for guix-patches@gnu.org; Mon, 22 Apr 2024 01:29:47 -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 1rymFP-0001gg-3N for guix-patches@gnu.org; Mon, 22 Apr 2024 01:29:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rymFe-0004mj-PE for guix-patches@gnu.org; Mon, 22 Apr 2024 01:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70509] [PATCH 2/2] gnu: nss: Fix cross-compilation. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Apr 2024 05:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70509 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70509@debbugs.gnu.org Received: via spool by 70509-submit@debbugs.gnu.org id=B70509.171376378718242 (code B ref 70509); Mon, 22 Apr 2024 05:30:02 +0000 Received: (at 70509) by debbugs.gnu.org; 22 Apr 2024 05:29:47 +0000 Received: from localhost ([127.0.0.1]:45473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rymFP-0004jz-1N for submit@debbugs.gnu.org; Mon, 22 Apr 2024 01:29:47 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:35152 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rymFL-0004j5-IP for 70509@debbugs.gnu.org; Mon, 22 Apr 2024 01:29:45 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.232]) by APP-03 (Coremail) with SMTP id rQCowABXeiyu9SVmfhIiBQ--.13800S3; Mon, 22 Apr 2024 13:29:18 +0800 (CST) From: Zheng Junjie Date: Mon, 22 Apr 2024 13:29:17 +0800 Message-ID: <1f6e2f8302b773df64bfbe07ec215b359d74331e.1713763513.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: rQCowABXeiyu9SVmfhIiBQ--.13800S3 X-Coremail-Antispam: 1UD129KBjvdXoW7Xr17GF43uFW8Jr4DKw4xXrb_yoWDKwc_ur Wxtr13KrWIgFWqk3WDCrWFgr1Fq397Cr4xGFnrKFs29rnxWw45WayDCFy8A3WUCa1IgF1F yr4kuryYqry8ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3AYjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F4 0Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC 6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x 0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2 zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF 4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWU CwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCT nIWIevJa73UjIFyTuYvjxU2_MaUUUUU X-Originating-IP: [111.0.51.232] 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/nss.scm (nss)[arguments]<#:make-flags>: When cross-compilation, Add CROSS_COMPILE=1. <#:phases>: When cross-compilation, Set env NATIVE_CC to gcc. Change-Id: I5c9559a4b8cecf2cfc6c47d136d69c01a335faaf --- gnu/packages/nss.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index a93406b9eb..00770f11a9 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -157,6 +157,9 @@ (define-public nss (#$(target-linux?) "linux") (else "")))) #~()) + #$@(if (%current-target-system) + #~("CROSS_COMPILE=1") + #~()) (string-append "NSPR_INCLUDE_DIR=" (search-input-directory %build-inputs "include/nspr")) @@ -179,7 +182,8 @@ (define-public nss (setenv "CC" #$(cc-for-target)) ;; TODO: Set this unconditionally #$@(if (%current-target-system) - #~((setenv "CCC" #$(cxx-for-target))) + #~((setenv "CCC" #$(cxx-for-target)) + (setenv "NATIVE_CC" "gcc")) #~()) ;; No VSX on powerpc-linux. #$@(if (target-ppc32?)