From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +JqTFc8aV2FpFAAAgWs5BA (envelope-from ) for ; Fri, 01 Oct 2021 16:27:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EIAdEc8aV2GfbAAAB5/wlQ (envelope-from ) for ; Fri, 01 Oct 2021 14:27:27 +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 C54A0D21C for ; Fri, 1 Oct 2021 16:27:26 +0200 (CEST) Received: from localhost ([::1]:46218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVV-00045g-SM for larch@yhetil.org; Fri, 01 Oct 2021 10:27:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AL-Vb for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUC-0000W5-IC for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUC-0005gU-Ex for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system. References: In-Reply-To: Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831321594 (code B ref 50905); Fri, 01 Oct 2021 14:26:04 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:13 +0000 Received: from localhost ([127.0.0.1]:56909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTN-0005c8-3n for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Ta-ET for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMmK0; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:03 +0200 Message-Id: <20211001142140.17027-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 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=1633098107; bh=w34kHtGWnBZ5MxjxizImitn0skaztKbb1wU8Y5diKMo=; h=From:To:Cc:Subject:Date; b=QC5RAO9aHIP7zCP1nZJjIb21iFxGWCXHMVAPPfJDbyiDLWjOszt7M2o14hFrCo9A/ EQpB8u0fWD8c0KRX5KjsneuCBGRbvtTF1I3XhNkSERTdU0O60Ccpvq60+A7HV+P1Uk A0tGL3XcIhmtnQEhEPghUjeR/aIWzK5lYVhEXoLnHXs0KH+y9Aoubg4xVgu5lhelll EG6ft1/BlHDXmfiX3IZmEC6wl2HaM4iWJSTSV+ZbFLopC+iuzbjlELAGSXewrBgk88 lnl7MKHBRXYv5+5TCoA9OPHwqE/EBEgA+v32WnOsF0A99y5KtDNlxMVVdY3glrN8P4 DT3W7N6QAGeGw== 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=1633098446; 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=w34kHtGWnBZ5MxjxizImitn0skaztKbb1wU8Y5diKMo=; b=YGWivREsA/Xhj7PUlAIW8PPwgyh7MBErueUXnW3aa9o3+HfKYs0cN4VFuQpUjPLZ8z3cIw 1z6KiW2amDFuNYYAGSFJcb4BG/yFPKQwU2peE6ONosARUbNVOZXcaX2T+KmRuK5EO0wcso hP6Nu1AzSyDtF3WyU75sRGOtBQvcWK2fjKObvDJXBnS0c8ovC7jVu+Cmq5jeuOvc08S9Mz r2YWurlJVM8qciy7HVYaVCq1IQfszABGZaHLpNr84K3OqrY9qYPNoVyKiu6T0StYPPTybb SkTe1zFfqxgQVF/fJ9UBmCJCL23GknBkgeKjGGjXzWYtDuCv3n4aa+WC9b46bQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633098446; a=rsa-sha256; cv=none; b=ewXx5P6X1eYytlt6iOX5XmHg4tJvyzT+AAc4eebREuthrulZPwpttwaFXZIGp4br1q6Bgb 3VPDo9SL+Fo/Ja85KSokvdEoCnGjOjDJKdaaFVI3v4PAnaR65ZGVhzlYc8Vpu4psXmE4gB VG2N3Myf4Eh8zEGrM1IJuBfyisdfZks8GQHARRjJ9C2p39klmr76PaEmux3MiEbwr8e8Ri uJqtWGbALeqs0BXCuoznqxiD2k7BE86BiWSRigfLf8A9jj8oq9rxh03AblypX37V44QRfe /ijq8BTKW0mTRpnWJdoD4SuSv9gXFWbEsmMBznLePB7GmAh4xvPGsKuVpV+Ypg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=QC5RAO9a; 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.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=QC5RAO9a; 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: C54A0D21C X-Spam-Score: -0.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: 03XTC3sAjCOH * guix/build-system/mozilla.scm (lower-mozilla): New procedure. (mozilla-build-system): New variable. * Makefile.am (MODULES): Add it. * doc/guix.texi (Build Systems): Document it. --- Makefile.am | 1 + doc/guix.texi | 9 ++++++ guix/build-system/mozilla.scm | 52 +++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 guix/build-system/mozilla.scm diff --git a/Makefile.am b/Makefile.am index 56f60278b7..76166f4eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,7 @@ MODULES = \ guix/build-system/font.scm \ guix/build-system/go.scm \ guix/build-system/meson.scm \ + guix/build-system/mozilla.scm \ guix/build-system/minify.scm \ guix/build-system/minetest.scm \ guix/build-system/asdf.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 830a230bd0..996526eb83 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8000,6 +8000,15 @@ directory, the parameter @code{#:javascript-files} can be used to specify a list of file names to feed to the minifier. @end defvr +@defvr {Scheme Variable} mozilla-build-system +This variable is exported by @code{(guix build-system mozilla)}. It +sets the @code{--target} and @code{--host} configuration flags to what +software developed by Mozilla expects -- due to historical reasons, +Mozilla software expects @code{--host} to be the system that is +cross-compiled from and @code{--target} to be the system that is +cross-compiled to, contrary to the standard Autotools conventions. +@end defvr + @defvr {Scheme Variable} ocaml-build-system This variable is exported by @code{(guix build-system ocaml)}. It implements a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists diff --git a/guix/build-system/mozilla.scm b/guix/build-system/mozilla.scm new file mode 100644 index 0000000000..b4141c8177 --- /dev/null +++ b/guix/build-system/mozilla.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system mozilla) + #:use-module (guix build-system gnu) + #:use-module (guix build-system) + #:use-module (guix utils) + #:export (mozilla-build-system)) + +;; +;; Build procedure for packages using Autotools with the Mozillian conventions +;; for --target, --host and --build, which are different from the GNU +;; conventions. +;; +;; Code: + +(define* (lower-mozilla name #:key system target #:allow-other-keys + #:rest arguments) + (define lower (build-system-lower gnu-build-system)) + (if target + (apply lower + (substitute-keyword-arguments arguments + ;; Override --target and --host to what Mozillian configure + ;; scripts expect. + ((#:configure-flags configure-flags ''()) + `(cons* ,(string-append "--target=" target) + ,(string-append "--host=" (nix-system->gnu-triplet system)) + ,configure-flags)))) + (apply lower name arguments))) ; not cross-compiling + +(define mozilla-build-system + (build-system + (name 'mozilla) + (description "The build system for Mozilla software using the Autotools") + (lower lower-mozilla))) + +;;; mozilla.scm ends here base-commit: 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b -- 2.33.0