From: Alan Third <alan@idiocy.org>
To: emacs-devel@gnu.org
Subject: Re: master 7555f93: Remove src/macuvs.h from Git repository
Date: Sat, 22 Jun 2019 20:21:35 +0100 [thread overview]
Message-ID: <20190622192135.GA57900@breton.holly.idiocy.org> (raw)
In-Reply-To: <m2pnn5j50h.fsf@gmail.com>
On Sat, Jun 22, 2019 at 12:20:14PM +0200, Robert Pluim wrote:
>
> *grumble* This stuff has broken the build on macOS, probably because
> itʼs now building an initial emacs in a configuration thatʼs not been
> tested in a while, judging by the the contents of config.h:
>
> In file included from nsterm.m:49:
> ./nsterm.h:1322:20: error: typedef redefinition with different types ('NSUInteger' (aka 'unsigned long') vs 'enum NSWindowStyleMask')
> typedef NSUInteger NSWindowStyleMask;
>
> ^
> /System/Library/Frameworks/AppKit.framework/Headers/NSWindow.h:35:32: note: previous definition is here
> typedef NS_OPTIONS(NSUInteger, NSWindowStyleMask) {
> ^
> In file included from nsterm.m:49:
> ./nsterm.h:1326:6: error: enumeration previously declared with fixed underlying type
> enum NSWindowTabbingMode
> ^
>
> (and src/macuvs.h obviously does not get regenerated)
Hmm, so I'm seeing HAVE_NS defined but neither NS_IMPL_COCOA nor
NS_IMPL_GNUSTEP.
That will break things in a few places as there is an assumption that
if you’re building NS you must have an implementation of it.
The following fixes it:
modified configure.ac
@@ -1959,11 +1959,19 @@ AC_DEFUN
CFLAGS="$CFLAGS -x objective-c"
GNU_OBJC_CFLAGS=
LIBS_GNUSTEP=
+
+ # 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
+ with_ns="no"
+fi
+
if test "${with_ns}" != no; 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
+ if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes
ns_appdir=`pwd`/nextstep/Emacs.app
ns_appbindir=${ns_appdir}/Contents/MacOS
But turns the build into:
./autogen.sh
./configure
make
./configure
make
make install
And if the user accidentally runs ‘make install’ after the first make
it’s going to try to install Emacs in /usr or something, which is
generally the wrong thing on macOS.
Bizarrely I ended up with an X build after the first make...
I don’t know what the right thing to do is.
--
Alan Third
next prev parent reply other threads:[~2019-06-22 19:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190621220118.16051.70712@vcs0.savannah.gnu.org>
[not found] ` <20190621220121.8B68D209DE@vcs0.savannah.gnu.org>
2019-06-21 23:02 ` master 7555f93: Remove src/macuvs.h from Git repository Glenn Morris
2019-06-21 23:33 ` Paul Eggert
2019-06-22 0:21 ` Glenn Morris
2019-06-22 0:25 ` Paul Eggert
2019-06-22 7:35 ` Eli Zaretskii
2019-06-22 8:23 ` martin rudalics
2019-06-22 9:34 ` Eli Zaretskii
2019-06-22 10:20 ` Robert Pluim
2019-06-22 18:50 ` Paul Eggert
2019-06-22 19:21 ` Alan Third [this message]
2019-06-22 19:27 ` Paul Eggert
2019-06-22 8:56 ` Lars Ingebrigtsen
2019-06-22 20:56 ` Glenn Morris
2019-06-23 4:08 ` YAMAMOTO Mitsuharu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190622192135.GA57900@breton.holly.idiocy.org \
--to=alan@idiocy.org \
--cc=emacs-devel@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.