Re: Reproducible work with natively compiled Emacs

[Ihor Radchenko <yantar92@posteo.net>]

Pedro Andres Aranda Gutierrez <paaguti@gmail.com> writes:

>> I have been experiencing some inconsistencies with org-mode, which I
>> have been able to trace own to using native compilation and not knowing
>> where the files from main were.

Thanks for the patch!
See my comments inline.

> +# This is where Emacs stores the .eln files
> +ELNDIR        = $(shell emacs --batch --eval '(princ (car native-comp-eln-load-path))')

Please use $(EMACS).

> +cleaneln::
> +	for elnf in $(patsubst %.eln, %-*.eln, $(LISPN)); do \
> +	  find $(ELNDIR) -name $$elnf -exec $(RM) -v {} \; ;\
> +	done

$(FIND).
Also, avoid using bash as much as possible in favor or GNU make
constructs. You can use $(foreach ...) here.

>  clean-install:
>  	if [ -d $(DESTDIR)$(lispdir) ] ; then \
>  	  $(RM) $(DESTDIR)$(lispdir)/org*.el* $(DESTDIR)$(lispdir)/ob*.el* $(DESTDIR)$(lispdir)/ol*.el* $(DESTDIR)$(lispdir)/ox*.el* ; \
> --
> 2.34.1
> From 6d98dfb3d72171e0231823260165b23e8b9963ee Mon Sep 17 00:00:00 2001
> From: "Pedro A. Aranda" <paaguti@gmail.com>
> Date: Mon, 11 Mar 2024 09:47:12 +0100
> Subject: [PATCH 1/3] Add cleaneln target
>
> * mk/targets.mk: add the 'cleaneln' target
>
> ---
>  mk/targets.mk | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/mk/targets.mk b/mk/targets.mk
> index de849c4fb..ab9ec2a1f 100644
> --- a/mk/targets.mk
> +++ b/mk/targets.mk
> @@ -143,6 +143,9 @@ cleanall: cleandirs cleantest
>  $(CLEANDIRS:%=clean%):
>  	-$(FIND) $(@:clean%=%) \( -name \*~ -o -name \*.elc \) -exec $(RM) {} +
>
> +cleaneln:
> +	$(MAKE) -C lisp $@
> +

Should be in .PHONY

> --- a/etc/ORG-NEWS
> +++ b/etc/ORG-NEWS
> @@ -11,7 +11,8 @@ See the end of the file for license conditions.
>  
>  Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
>  
> -* Version 9.7 (not released yet)
> +* V
> +ersion 9.7 (not released yet)

This is a stray newline.

> +*** ~make cleaneln~ will remove the .eln files from the user emacs configuration
> +
> +Natively compiled Emacs lisp files generated with ~make native~ are
> +now correctly located and deleted with ~make cleaneln~.
> +
>  ** Miscellaneous
>  *** =org-crypt.el= now applies initial visibility settings to decrypted entries

"Add 'native' option to 'make help'" from the previous version of the
patch still makes sense.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>