From patchwork Wed Aug 25 18:02:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32251 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 2F29A27BBE4; Wed, 25 Aug 2021 19:04:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E1A8827BBE1 for ; Wed, 25 Aug 2021 19:04:18 +0100 (BST) Received: from localhost ([::1]:55618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxG5-0007wf-U8 for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFt-0007sg-Br for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFt-0000pC-1Y for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFs-0002nF-TN for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 06/52] gnu: nspr: Adjust to Mozilla cross-compilation conventions. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991463710568 (code B ref 50201); Wed, 25 Aug 2021 18:04:04 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:57 +0000 Received: from localhost ([127.0.0.1]:47675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFl-0002kI-5u for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:57 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFV-0002fp-MW for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:42 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3hTH; Wed, 25 Aug 2021 20:03:41 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:46 +0200 Message-Id: <20210825180332.5720-6-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914621; bh=91nw3xm/j8z3TOe7GW5zhxpr5YBMKVGVy8EzGUESIlk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DkjLcbFIr6bTTSIaYEiX2Q8mxfCwRAx8hUtqzoj/GPT1dCyzDw6NWwsJulp5WKZxr 2WNf5tOKlxvwPw7zivuQ/GlwnzN1fdNAF7UBgbqZNxFgZGGIFkU2Lk7xaZPda5x95j SaRvYd6RPBelaqx7PadV3jKcxMFSv8Q2C7sXfS9Btl6ELEJ3o+3qS8Yp3Qa8G/cRfo P7lPDJqWH0O3qArNkbZuPtTqZwQd1uM2uE0Y2JKsVjsQrRozHZld0ZlFeq4YQ+WdWn qto00BkF/JNC4iG0biXjfEOudVlpBmT6urR6k9x9wpRBLzhw2q+Nny9Xkk4OOVP8TW yoqytrsHoLOMg== 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/nss.scm (nspr)[arguments]<#:configure-flags>: Set --host and --target inappropriately when cross-compiling. --- gnu/packages/nss.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 55eddc0c91..6560aede56 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,11 +52,20 @@ `(("perl" ,perl))) (arguments `(#:tests? #f ; no check target - #:configure-flags (list "--disable-static" - "--enable-64bit" - (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib")) + #:configure-flags + (list "--disable-static" + "--enable-64bit" + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + ;; Mozilla deviates from Autotools conventions + ;; due to historical reasons. Adjust to Mozilla conventions, + ;; otherwise the Makefile will try to use TARGET-gcc + ;; as a ‘native’ compiler. + ,@(if (%current-target-system) + `(,(string-append "--host=" + (nix-system->gnu-triplet (%current-system))) + ,(string-append "--target=" (%current-target-system))) + '())) ;; Use fixed timestamps for reproducibility. #:make-flags '("SH_DATE='1970-01-01 00:00:01'" ;; This is epoch 1 in microseconds.