From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4L27CiWGJmE7mAAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:04:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id qAFpBiWGJmG/IwAA1q6Kng (envelope-from ) for ; Wed, 25 Aug 2021 18:04:21 +0000 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 D49CD7005 for ; Wed, 25 Aug 2021 20:04:20 +0200 (CEST) Received: from localhost ([::1]:55618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxG7-0007wf-HO for larch@yhetil.org; Wed, 25 Aug 2021 14:04:19 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629914660; 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: 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:dkim-signature; bh=91nw3xm/j8z3TOe7GW5zhxpr5YBMKVGVy8EzGUESIlk=; b=mqtpr8F1YZbHSUhnq3p3RTJ+rF2FmNLiraq6zOHGtciqjy4fajNGVJ+Hn2DNUQX1MIOGfP e3lAKK6fpyeOYQiGUI78zJ/cbbsUc+lPpvKCJh5u7G7mghxrJ/SSfZiVNWJ0431jlaZgiv 2HX04A73larc0ZbmuGo2bm7U42x+xNO4lQlGq29xeMYhQcu0V+6b/KH2bpSvOl2b4oF9+n mFEcLE6/7NoiIIWn3qKYErCt28uL99gmGKQ1xWkgh/LWuYxBnuXtkIubqZJEqScQmi5wux N924fV2c10l4nhI2qGKNtp5Qg8J+wxgxLvOkSY1Ggz1TN0FVVAnnMQ3CXHO55A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914660; a=rsa-sha256; cv=none; b=QKi4CKXC+GNP684BgCeoRkH9IlpZWPYh2ImU9qhVhNwChnOko30VBhZnoSLNuF0gsUX2hr cxNfM0zpG5Vv6HZcEnyTh7HOO2LYyar1C5ssQzCmVUdLrHO/o2JvCw1ECFQRvect+C/aX2 7qBSd9o/DcUue16kppaCsWa8yOpzSWIPwdVqtSjoxmLbG7yIUvc6fSVn5pMO2LBvSZ2/Dq LULqDhV+sFQWZ8AeG+OvcUQwO3b+p6zYf7L4QVBQsUjanZL3WzuLvVzw9TNGNEbMuawngT ac4JX5E5yvZHX2LqLTKY0oEPikkLwyaxwTv7uP8pMbdITM9oltvaRi+otej5tQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=DkjLcbFI; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=DkjLcbFI; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: D49CD7005 X-Spam-Score: -0.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: 33MXEqQy1kMZ * 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. -- 2.33.0