From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: Nicolas Graves <ngraves@ngraves.fr>, 66225@debbugs.gnu.org
Cc: Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>,
Andrew Tropin <andrew@trop.in>
Subject: [bug#66225] [PATCH v2 2/2] gnu: emacs-next-minimal: Add patch emacs-native-comp-driver-options.
Date: Mon, 02 Oct 2023 19:06:00 +0200 [thread overview]
Message-ID: <53f9f0cfabdc31c7b9fb918bd9eb620aab7d3e54.camel@gmail.com> (raw)
In-Reply-To: <cfea5134af0c5178ccedd4330dd7bdd95d59b7cd.1696190809.git.ngraves@ngraves.fr>
Am Sonntag, dem 01.10.2023 um 22:06 +0200 schrieb Nicolas Graves:
> * 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.
> ---
Perhaps we should name this file emacs-next-native-comp-driver-options?
;) Then we can do this with a 1/1 series.
> 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
> +
Otherwise LGTM.
Cheers
next prev parent reply other threads:[~2023-10-02 17:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 1:37 [bug#66225] [PATCH] gnu: emacs: Fix emacs native compilation on most recent emacsen Nicolas Graves via Guix-patches via
2023-10-01 20:06 ` [bug#66225] [PATCH v2 1/2] patch: emacs-native-comp-driver-options: Rename patch Nicolas Graves via Guix-patches via
2023-10-01 20:06 ` [bug#66225] [PATCH v2 2/2] gnu: emacs-next-minimal: Add patch emacs-native-comp-driver-options Nicolas Graves via Guix-patches via
2023-10-02 17:06 ` Liliana Marie Prikler [this message]
2023-10-02 19:30 ` Nicolas Graves via Guix-patches via
[not found] ` <f1b08fdebcfbb9b7dc513118a1994148ac38042e.1696608253.git.liliana.prikler@gmail.com>
2023-10-07 5:56 ` [bug#66225] [PATCH v3] gnu: emacs-next-minimal: Apply Guix patches Andrew Tropin
2023-10-08 6:55 ` bug#66225: " Liliana Marie Prikler
2023-10-08 10:21 ` [bug#66225] " Andrew Tropin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53f9f0cfabdc31c7b9fb918bd9eb620aab7d3e54.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=66225@debbugs.gnu.org \
--cc=andrew@trop.in \
--cc=cox.katherine.e+guix@gmail.com \
--cc=ngraves@ngraves.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).