From patchwork Sun Oct 1 20:06:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 54438 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 C669227BBE9; Sun, 1 Oct 2023 21:08:05 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 86E8427BBE2 for ; Sun, 1 Oct 2023 21:08:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qn2jE-0003yt-TT; Sun, 01 Oct 2023 16:07:49 -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 1qn2jD-0003yd-In for guix-patches@gnu.org; Sun, 01 Oct 2023 16:07:47 -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 1qn2jD-0000vs-7z for guix-patches@gnu.org; Sun, 01 Oct 2023 16:07:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qn2jS-0006WQ-Bs; Sun, 01 Oct 2023 16:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66225] [PATCH v2 2/2] gnu: emacs-next-minimal: Add patch emacs-native-comp-driver-options. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 01 Oct 2023 20:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66225 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66225@debbugs.gnu.org Cc: Nicolas Graves , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 66225-submit@debbugs.gnu.org id=B66225.169619083725001 (code B ref 66225); Sun, 01 Oct 2023 20:08:02 +0000 Received: (at 66225) by debbugs.gnu.org; 1 Oct 2023 20:07:17 +0000 Received: from localhost ([127.0.0.1]:35411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn2ii-0006V9-HG for submit@debbugs.gnu.org; Sun, 01 Oct 2023 16:07:16 -0400 Received: from 17.mo583.mail-out.ovh.net ([46.105.56.132]:53773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qn2ig-0006Us-6F for 66225@debbugs.gnu.org; Sun, 01 Oct 2023 16:07:15 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.138.54]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id E743F25950 for <66225@debbugs.gnu.org>; Sun, 1 Oct 2023 20:06:56 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-vqfwj (unknown [10.110.171.120]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A39701FDBA; Sun, 1 Oct 2023 20:06:56 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-vqfwj with ESMTPSA id sIskJWDRGWXsQQIA6/nsBg (envelope-from ); Sun, 01 Oct 2023 20:06:56 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S00392b62ef2-2579-47b0-bc8b-6af12015ba02, B342A71C4E34392951E6902E150B79F8A6CFD5EE) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Sun, 1 Oct 2023 22:06:49 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Ovh-Tracer-Id: 15087058755270599394 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdefgddukecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieeivddvheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/emacs.scm (emacs-next-minimal)[origin](patches): Add patch emacs-native-comp-driver-options. * gnu/local.mk: Add patch emacs-native-comp-driver-options. * gnu/packages/patches/emacs-native-comp-driver-options.patch: Add file. --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 4 +++- .../emacs-native-comp-driver-options.patch | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-native-comp-driver-options.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef7888f5b5..956f846928 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1109,6 +1109,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-29-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 54581d968d..cd01285a83 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -498,7 +498,9 @@ (define-public emacs-next-minimal (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9"))))))) + (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9")) + (patches + (search-patches "emacs-native-comp-driver-options.patch"))))))) (define* (emacs->emacs-next emacs #:optional name #:key (version (package-version emacs-next-minimal)) diff --git a/gnu/packages/patches/emacs-native-comp-driver-options.patch b/gnu/packages/patches/emacs-native-comp-driver-options.patch new file mode 100644 index 0000000000..e4ed5a48f1 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-driver-options.patch @@ -0,0 +1,18 @@ +We substitute this anyway, so let's make it easier to substitute. + +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -203,9 +203,7 @@ and above." + :type '(repeat string) + :version "28.1") + +-(defcustom native-comp-driver-options +- (cond ((eq system-type 'darwin) '("-Wl,-w")) +- ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) ++(defcustom native-comp-driver-options nil + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. +-- +2.38.0 +