Re: master 7555f93: Remove src/macuvs.h from Git repository

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

On 6/21/19 4:02 PM, Glenn Morris wrote:
> src/macuvs.h is generated by an Emacs lisp script.
> So won't this cause a bootstrap failure on platforms where the emacs
> excutable requires src/macuvs.h in order to build; ie Mac OS?

Ouch, thanks, I didn't think of that. I installed the attached patch to 
work around the immediate problem. We could do something fancier to 
better automate a headlesss-then-headful build process, though that 
would require someone who can easily test on macOS. Alternatively, I 
could bring back macuvs.h even though it's ugly to commit that generated 
file into Git.


[-- Attachment #2: 0001-Fix-default-build-from-Git-on-macOS.patch --]
[-- Type: text/x-patch, Size: 1041 bytes --]

From 9b170060ba80c62a3a38e39d0c9692bdddd6ae47 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 21 Jun 2019 16:22:26 -0700
Subject: [PATCH] Fix default build-from-Git on macOS

* configure.ac (NS_IMPL_COCOA): Do not default to "yes" if
src/macuvs.h is absent, which is possible in a build from Git.
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index be5c4e35b1..c1c4970002 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1960,7 +1960,10 @@ AC_DEFUN
 GNU_OBJC_CFLAGS=
 LIBS_GNUSTEP=
 if test "${with_ns}" != no; then
-  if test "${opsys}" = darwin; then
+  # macfont.o requires macuvs.h which is absent in the repository,
+  # so avoid NS_IMPL_COCOA if macuvs.h is absent.
+  # Even a headless Emacs can build macuvs.h, so this lets you bootstrap.
+  if test "${opsys}" = darwin && test -f "$srcdir/src/macuvs.h"; then
      NS_IMPL_COCOA=yes
      ns_appdir=`pwd`/nextstep/Emacs.app
      ns_appbindir=${ns_appdir}/Contents/MacOS
-- 
2.21.0