From patchwork Fri Oct 1 14:21:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33490 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 B8C2727BBE3; Fri, 1 Oct 2021 15:26:39 +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 93C6427BBE1 for ; Fri, 1 Oct 2021 15:26:35 +0100 (BST) Received: from localhost ([::1]:43684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUg-0002GO-Lj for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0002Ak-WA for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0000b4-Fj for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUJ-0005iW-CZ for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: Use mozilla-build-system. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26:11 +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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309832121723 (code B ref 50905); Fri, 01 Oct 2021 14:26:11 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTR-0005e6-6i for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:20 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tc-EG for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKW; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:05 +0200 Message-Id: <20211001142140.17027-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=nt9yZbzYYVKoSncxX9Vm+mRzHq2SC2tPwsrKIWPJz6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hazTuodZLvvk0/muUJeA0IK27/smhUcHPuGT8FuMqvDDNF5qcXpMSDQ3hDTlAf9N/ 1e0kRJoFQVikosjQJlcX2vyYRRGdFpJcaShZ3HNqiFEavHBy5EGKTAkHjmvQadnb39 X94VWSya0nfP9TyK386DvDQfODx6sfAqUBdCMhFpKHlMNle8zUhq0KmLLwBMmHzcjc 4rns6AnQqHkmFWsTJImsbFdEG/x0Z7Pij/P0odhDPRVrZ/U5TS+cJox18EfpmKOg/6 ejFo9ooXCKg733boi4mSLuvNC9mMuET5ma8VZZlOndhgnU5VcPtQN9v6H9D9+EeZmr Ng0hj/Pss3uAQ== 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 Due to the use of 'inherit', all versions of mozjs are adjusted. * gnu/packages/gnuzilla.scm (mozjs)[build-system]: Adjust it. (mozjs)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/gnuzilla.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5dd90e4e20..9647bb7db5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -49,6 +49,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) #:use-module (guix build-system trivial) + #:use-module (guix build-system mozilla) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -108,7 +109,7 @@ (substitute* '("js/src/config/milestone.pl") (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")) #t)))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -390,15 +391,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc" - ;; Mozilla deviates from Autotools conventions due to historical - ;; reasons. - #$@(if (%current-target-system) - #~(#$(string-append - "--host=" - (nix-system->gnu-triplet (%current-system))) - #$(string-append "--target=" (%current-target-system))) - #~()))) + "--disable-jemalloc")) #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found.