From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qWewDfTmVGGoFQAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 00:21:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4J/MCPTmVGGBQAAAB5/wlQ (envelope-from ) for ; Wed, 29 Sep 2021 22:21:40 +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 D697F13A2C for ; Thu, 30 Sep 2021 00:21:39 +0200 (CEST) Received: from localhost ([::1]:44150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxK-0007Wo-HQ for larch@yhetil.org; Wed, 29 Sep 2021 18:21:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwn-0006eq-Db for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39176) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwm-00020u-Uo for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwm-0000jB-Qq for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 03/38] gnu: mozjs: 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:21:04 +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.16329540132470 (code B ref 50905); Wed, 29 Sep 2021 22:21:04 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:13 +0000 Received: from localhost ([127.0.0.1]:50659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvs-0000dR-Hr for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:12 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvU-0000Y7-IK for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:49 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKkQk; Thu, 30 Sep 2021 00:19:44 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:03 +0200 Message-Id: <20210929221938.17168-3-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 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953984; bh=nt9yZbzYYVKoSncxX9Vm+mRzHq2SC2tPwsrKIWPJz6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NX15xAHmt9S3erGHfTsWLbt1aG1xEqZpq4wElm2ahxGZ1NByt9lZguziqKcdRkqeK s08EVVjna9OKp7jdAnWqXWOHz50r1X7MtjooNOjj/ofEeEqv6sJz9MTM+KYksN5LcV 9qWNJJqgyY8WEY7VeWS7x7+rxN7WT8yn1TnSAe+8LMDAfiF4wX8oaL77zq90ARJ/Uv FgYr2U1vGgjYX5zLUn7Fg/S9zd+hS7JQ9gt78bH7gHfRVRmq+VAyvkc6S9JVLStIzB VFo9EBYnKefReSzbpuTgzjmOUuwkQDx4gYoS09OrozESa/LBnhBIGD/R8dQxEXNG3g ++aNoTLWkIvrQ== 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=1632954099; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=nt9yZbzYYVKoSncxX9Vm+mRzHq2SC2tPwsrKIWPJz6c=; b=DBDbqobqPivE2qjX8PITeZZcckbjT7jjog3XJovQEEgRxDfOkuJEkhQmswcxe9dqvR3Tvu pQwDRwQr+ZIrgZv6irbuoWby/b06BELrxLSo5BX7zG6AOLkQ3IjEUsx9e1p8kBnyQ5C7LF xiRXYlgIvhbKYCu7r7CHr+78vvpYi8Iy+bViFSGVH9KqrPj8vFhrNEv+INypKsIVSUQjdJ Q1Jd83GQGHmLpR43ZD7BZZvwCcGaXBAaFATdziwyrH1cOQreOIh3nM9VLjW9lAZwm//jK2 68/LlkZIcEuDxBRZpZjyeWlz/18NYgxif1iVi+ONgAAQfgJ4W6P0TrQZ28YZHw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632954099; a=rsa-sha256; cv=none; b=oEUfhHoOemlXNudWFQHE9j2W6SZca9EpsdCzU41ZZNxQI1fZgowjmWfmMV/l91p5EAgOGM cudqvTuJezWeMvNRlKRv+zMpmghC5IdOgzluslPOiNGIJ4bjQ2Sd0/C7WJW67wVucN1INI c8DT9RXRAkbNYEHBXcz5fX/yKdffqk1uak+ukWW0Ogt3a8pqsTRlbBDUjsX/M824SelTJ/ QT4m9Qx539oj3391HU/RSHv3SSfZgacObK8nUhSK0QQx/pYUSmW2e7U+Yn4y5UgOCXSmn0 R6eFISmHixiAlJ8UVU1nN/ALx2dEfdM/EFUu85pKfrItN+t16RN3fgOvh1T5+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=NX15xAHm; 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: 3.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=NX15xAHm; 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: D697F13A2C X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: DcdF5fxL4YMw 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. -- 2.33.0