From patchwork Mon Apr 21 22:31:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 41909 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 BECBD27BC4B; Mon, 21 Apr 2025 23:32:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3C67F27BC49 for ; Mon, 21 Apr 2025 23:32:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6zgN-0004eA-6b; Mon, 21 Apr 2025 18:32:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6zgI-0004dK-M2 for guix-patches@gnu.org; Mon, 21 Apr 2025 18:32:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u6zgI-0008KH-BU for guix-patches@gnu.org; Mon, 21 Apr 2025 18:32:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=GMXifuocj8HNry51aEI9rWh8j9p8gg5PoZiZ7Bv+6FI=; b=mLaa2zzPaE4vADjjd5MIlndH6b5elEo5XUed/ciMbOSpCb3Kbo97wIt2JJHLrv7CUbP7UkHmCkqnxcOek9YKrWG/qFEOa6qZzURwGzDr/mfSiAtUL9PwWdbejdwvxy3aj0BiyQFp3K4hl+owBBPlYJ5iEoU0Mk8Rulg2EObs/VwjdjB4gYYUJyMIPFNbI4jwPQBdl/RQVQ2/46uwXyODHJitnxLVTqFMvixuAPhxPDlDJwxZnZ/yaTfcJxaSirDPDoBL5qldRP3f1V/H/fHnfsyblSX33xCsKIZq6vdKRYJPlg27VQNqVPOfa0jLnK3Wizvr8O8ZmK5LR2eKxoooGQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6zgH-0004gO-Ue; Mon, 21 Apr 2025 18:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77976] [PATCH 2/3] gnu: make-torbrowser: Untangle from x86-64. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: nandre@riseup.net, clement@lassieur.org, hako@ultrarare.space, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Mon, 21 Apr 2025 22:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77976@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , nandre@riseup.net, clement@lassieur.org, hako@ultrarare.space, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org X-Debbugs-Original-Xcc: nandre@riseup.net, clement@lassieur.org, hako@ultrarare.space, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org Received: via spool by 77976-submit@debbugs.gnu.org id=B77976.174527468417939 (code B ref 77976); Mon, 21 Apr 2025 22:32:01 +0000 Received: (at 77976) by debbugs.gnu.org; 21 Apr 2025 22:31:24 +0000 Received: from localhost ([127.0.0.1]:40574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6zff-0004fG-RG for submit@debbugs.gnu.org; Mon, 21 Apr 2025 18:31:24 -0400 Received: from mx1.riseup.net ([198.252.153.129]:34536) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u6zfd-0004ey-7t for 77976@debbugs.gnu.org; Mon, 21 Apr 2025 18:31:21 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4ZhKpW2hW3zDqQw for <77976@debbugs.gnu.org>; Mon, 21 Apr 2025 22:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1745274675; bh=ZU6sSO25Nv9nMy3PeKX7dyoMdRzMUfES++F7iFbimTs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FDog6oxhB8YqLoN8ttFEI2LalYX2cUFAYheCAuI3ph9wV8XkfSMS6Yh89/xZCpKWK vESMxwchB81Ru9v9mOjGJD8GhRovdfi+nZr3d/xecEwiuNav0Yb6WjRcaW/CcnOHUZ j+tIvVbZURB5vdsDvpZvV8tjPTtSeardFIjgM6XQ= X-Riseup-User-ID: 4978533DF17D809F65A6968176AD18BF0C30EF2FBB27BD24B78CD8E9590E579D Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4ZhKpV1gQ6zFvpS; Mon, 21 Apr 2025 22:31:13 +0000 (UTC) From: =?utf-8?b?QW5kcsOp?= Batista Date: Mon, 21 Apr 2025 19:31:06 -0300 Message-ID: <20250421223106.4782-1-nandre@riseup.net> In-Reply-To: <20250421222418.4671-1-nandre@riseup.net> References: <20250421222418.4671-1-nandre@riseup.net> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tor-browsers.scm (make-torbrowser)[native-inputs]: Use nasm only on x86. [arguments] <#:phases> 'mozconfig: Conditionally select mozconfig file. [supported-systems]: Restrict build to upstream supported architectures. Change-Id: Ia13795f88ea84339b851f52537cffc779142d404 --- gnu/packages/tor-browsers.scm | 49 ++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 644bdac5ee..dd2f98f6b9 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -265,21 +265,22 @@ (define* (make-torbrowser #:key zip zlib)) (native-inputs - (list - rust - `(,rust "cargo") - rust-cbindgen-0.26 - lld-as-ld-wrapper-18 ; for cargo rustc - llvm-18 - clang-18 - perl - node-lts - python-wrapper - yasm - nasm ; XXX FIXME: only needed on x86_64 and i686 - pkg-config - m4 - which)) + (append + (list + rust + `(,rust "cargo") + rust-cbindgen-0.26 + lld-as-ld-wrapper-18 ; for cargo rustc + llvm-18 + clang-18 + perl + node-lts + python-wrapper + yasm + pkg-config + m4 + which) + (if (target-x86?) (list nasm) '()))) (arguments (list #:tests? #f ;not worth the cost @@ -524,12 +525,16 @@ (define (runpaths-of-input label) (setenv "MOZ_BUILD_DATE" #$build-date))) (add-before 'configure 'mozconfig (lambda* (#:key configure-flags #:allow-other-keys) - (with-output-to-file "mozconfig" - (lambda () - (format #t ". $topsrcdir/mozconfig-linux-x86_64~%") - (for-each (lambda (flag) - (format #t "ac_add_options ~a~%" flag)) - configure-flags))))) + (let ((arch (cond (#$(target-arm32?) "arm") + (#$(target-aarch64?) "aarch64") + (#$(target-x86-32?) "i686") + (#$(target-x86-64?) "x86_64")))) + (with-output-to-file "mozconfig" + (lambda () + (format #t ". $topsrcdir/mozconfig-linux-~a~%" arch) + (for-each (lambda (flag) + (format #t "ac_add_options ~a~%" flag)) + configure-flags)))))) ;; See tor-browser-build/projects/common/browser-localization. (add-before 'configure 'copy-firefox-locales (lambda _ @@ -798,6 +803,8 @@ (define (runpaths-of-input label) (variable "ICECAT_SYSTEM_DIR") (separator #f) ;single entry (files '("lib/icecat"))))) + (supported-systems (list "x86_64-linux" "i686-linux" + "aarch64-linux" "armhf-linux")) (home-page "https://www.torproject.org") (synopsis "Anonymous browser derived from Mozilla Firefox") (description