* feature/native-comp: [PATCH] Work around self-contained builds on macOS not being able to locate
@ 2020-08-19 21:37 Vibhav Pant
2020-08-20 8:05 ` Andrea Corallo via Emacs development discussions.
0 siblings, 1 reply; 3+ messages in thread
From: Vibhav Pant @ 2020-08-19 21:37 UTC (permalink / raw)
To: emacs-devel, akrl
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
This patch fixes the Nexstep Emacs.app build not being able to locate
the eln objects for the distributed elisp code. It is a little hacky,
but it works for the time being.
Thanks,
Vibhav
--
Vibhav Pant
vibhavp@gmail.com
GPG: 7ED1 D48C 513C A024 BE3A 785F E3FB 28CB 6AB5 9598
[-- Attachment #2: 0001-Set-BIN_DESTDIR-to-ns_appbindir-when-self-contained-.patch --]
[-- Type: application/x-patch, Size: 956 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: feature/native-comp: [PATCH] Work around self-contained builds on macOS not being able to locate
2020-08-19 21:37 feature/native-comp: [PATCH] Work around self-contained builds on macOS not being able to locate Vibhav Pant
@ 2020-08-20 8:05 ` Andrea Corallo via Emacs development discussions.
2020-08-21 9:10 ` Vibhav Pant
0 siblings, 1 reply; 3+ messages in thread
From: Andrea Corallo via Emacs development discussions. @ 2020-08-20 8:05 UTC (permalink / raw)
To: Vibhav Pant; +Cc: emacs-devel
Vibhav Pant <vibhavp@gmail.com> writes:
> This patch fixes the Nexstep Emacs.app build not being able to locate
> the eln objects for the distributed elisp code. It is a little hacky,
> but it works for the time being.
>
> Thanks,
> Vibhav
Hi Vibhav,
Thanks! At a first look I think this would not apply on the latest
branch as now LISP_DESTDIR should be ELN_DESTDIR.
Could you try updating the patch and see if still works with the new
directory arrangement?
Thanks
Andrea
--
akrl@sdf.org
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: feature/native-comp: [PATCH] Work around self-contained builds on macOS not being able to locate
2020-08-20 8:05 ` Andrea Corallo via Emacs development discussions.
@ 2020-08-21 9:10 ` Vibhav Pant
0 siblings, 0 replies; 3+ messages in thread
From: Vibhav Pant @ 2020-08-21 9:10 UTC (permalink / raw)
To: Andrea Corallo; +Cc: emacs-devel
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
Hi Andrea,
I amended the feedback to work with the latest branch.
Thanks,
Vibhav
On Thu, Aug 20, 2020 at 1:35 PM Andrea Corallo <akrl@sdf.org> wrote:
>
> Vibhav Pant <vibhavp@gmail.com> writes:
>
> > This patch fixes the Nexstep Emacs.app build not being able to locate
> > the eln objects for the distributed elisp code. It is a little hacky,
> > but it works for the time being.
> >
> > Thanks,
> > Vibhav
>
> Hi Vibhav,
>
> Thanks! At a first look I think this would not apply on the latest
> branch as now LISP_DESTDIR should be ELN_DESTDIR.
>
> Could you try updating the patch and see if still works with the new
> directory arrangement?
>
> Thanks
>
> Andrea
>
> --
> akrl@sdf.org
--
Vibhav Pant
vibhavp@gmail.com
GPG: 7ED1 D48C 513C A024 BE3A 785F E3FB 28CB 6AB5 9598
[-- Attachment #2: 0001-Set-BIN_DESTDIR-to-ns_appbindir-when-self-contained-.patch --]
[-- Type: application/octet-stream, Size: 956 bytes --]
From 229c0c5f8b93694c4993aa96e24a2694bcbc4e6c Mon Sep 17 00:00:00 2001
From: Vibhav Pant <vibhavp@gmail.com>
Date: Fri, 14 Aug 2020 14:12:29 +0530
Subject: [PATCH] Set BIN_DESTDIR to ns_appbindir when self contained build is
enabled
---
Makefile.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index f28623ef56..03dd881897 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -421,9 +421,13 @@ lib lib-src lisp nt:
dirstate = .git/logs/HEAD
VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
src: Makefile
+ifeq (${ns_self_contained},no)
$(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' BIN_DESTDIR='$(DESTDIR)${bindir}/' \
LISP_DESTDIR='$(DESTDIR)${lispdir}/' all
-
+else
+ $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' BIN_DESTDIR='${ns_appbindir}/' \
+ LISP_DESTDIR='$(DESTDIR)${lispdir}/' all
+endif
blessmail: Makefile src
$(MAKE) -C lib-src maybe-blessmail
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-21 9:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-19 21:37 feature/native-comp: [PATCH] Work around self-contained builds on macOS not being able to locate Vibhav Pant
2020-08-20 8:05 ` Andrea Corallo via Emacs development discussions.
2020-08-21 9:10 ` Vibhav Pant
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.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).