From patchwork Wed Sep 29 22:19:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33421 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 98ADF27BBE3; Wed, 29 Sep 2021 23:20:41 +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 5E10727BBE1 for ; Wed, 29 Sep 2021 23:20:41 +0100 (BST) Received: from localhost ([::1]:42130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhwO-0005wb-G8 for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:20:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhvo-0005vM-Gp for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhvn-0001AW-DN for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhvn-0000bY-6V for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 02/38] gnu: nspr: Use mozilla-build-system. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329539862150 (code B ref 50905); Wed, 29 Sep 2021 22:20:03 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:19:46 +0000 Received: from localhost ([127.0.0.1]:50573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvV-0000YO-Iu for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:46 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvU-0000Y9-4H for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKjQf; Thu, 30 Sep 2021 00:19:43 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:02 +0200 Message-Id: <20210929221938.17168-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953983; bh=vljAjo3/PZeUZYRN1VIkfQoAGE+KBNPQ84xN0OBM6bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZSrO/U1iwjwjwgPhl5FyixUEOy7M2gEKlOSF3bXwWttfkRJzUoxDbl/uZkN/jjmgx TgNN4Hc7MXk8fqIX19AB2nrWoA1/oElTNr4lOG0f8TaRPCblGJDv4syM/+0kp3oc5X 5/49TICLltmu8bmPoYlomOEjunZHFJmG+X9goSkdoO/QTREOLcIA4fy6mtEc96GjKF yPN/ick58ojbR7AYJCHStqXYSwFPR4yuqB3svoZKEGq3+o5+xb09C8dl2acD3GI6KG f6o9OZcN6z+fMqhT/p5vhQBYhY53WMhkH2OtBKxSIeMwmfOcCT6Skyqzl+RhFjyWQt TVrq0OEE2F5sg== 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)[build-system]: Adjust it. (nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/nss.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 381756e387..6196ad692d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -29,6 +29,7 @@ #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system mozilla) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages bash) @@ -49,7 +50,7 @@ (sha256 (base32 "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. @@ -72,16 +73,7 @@ (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))) - '())) + (assoc-ref %outputs "out") "/lib")) ;; Use fixed timestamps for reproducibility. #:make-flags '("SH_DATE='1970-01-01 00:00:01'" ;; This is epoch 1 in microseconds.