Re: master 5dd2d50: Fix NS native compilation builds

Re: master 5dd2d50: Fix NS native compilation builds

[Lars Ingebrigtsen]

alan@idiocy.org (Alan Third) writes:

> +# A NextStep style app bundle is relocatable, so instead of
> +# hard-coding paths try to generate them at run-time.
> +#
> +# The paths are mostly the same, and the bundle paths are different
> +# between macOS and GNUstep, so just replace any references to the app
> +# bundle root itself with the relative path.
> +epaths-force-ns-self-contained: epaths-force
> +	@(sed < ${srcdir}/src/epaths.h > epaths.h.$$$$	\
> +	  -e 's;${ns_appdir}/;;') &&			\
> +	${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h

This (or something else in this patch) leads to the src/epaths.h file
being invalid.  It starts like this:

* Hey Emacs, this is -*- C -*- code!  */
*
Copyright (C) 1993, 1995, 1997, 1999, 2001-2021 Free Software
Foundation, Inc.

This file is part of GNU Emacs.


Note the * instead of /* as the comment starter.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 5dd2d50: Fix NS native compilation builds

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Date: Sat, 26 Jun 2021 13:15:38 +0200
> Cc: Alan Third <alan@idiocy.org>
> 
> alan@idiocy.org (Alan Third) writes:
> 
> > +# A NextStep style app bundle is relocatable, so instead of
> > +# hard-coding paths try to generate them at run-time.
> > +#
> > +# The paths are mostly the same, and the bundle paths are different
> > +# between macOS and GNUstep, so just replace any references to the app
> > +# bundle root itself with the relative path.
> > +epaths-force-ns-self-contained: epaths-force
> > +	@(sed < ${srcdir}/src/epaths.h > epaths.h.$$$$	\
> > +	  -e 's;${ns_appdir}/;;') &&			\
> > +	${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
> 
> This (or something else in this patch) leads to the src/epaths.h file
> being invalid.  It starts like this:
> 
> * Hey Emacs, this is -*- C -*- code!  */
> *
> Copyright (C) 1993, 1995, 1997, 1999, 2001-2021 Free Software
> Foundation, Inc.
> 
> This file is part of GNU Emacs.
> 
> 
> Note the * instead of /* as the comment starter.

I think this is because EN_NS_SELF_CONTAINED ends up being "yes" on
systems where it shouldn't.

Re: master 5dd2d50: Fix NS native compilation builds

[Alan Third]

On Sat, Jun 26, 2021 at 02:25:43PM +0300, Eli Zaretskii wrote:
> > From: Lars Ingebrigtsen <larsi@gnus.org>
> > Date: Sat, 26 Jun 2021 13:15:38 +0200
> > Cc: Alan Third <alan@idiocy.org>
> > 
> > alan@idiocy.org (Alan Third) writes:
> > 
> > > +# A NextStep style app bundle is relocatable, so instead of
> > > +# hard-coding paths try to generate them at run-time.
> > > +#
> > > +# The paths are mostly the same, and the bundle paths are different
> > > +# between macOS and GNUstep, so just replace any references to the app
> > > +# bundle root itself with the relative path.
> > > +epaths-force-ns-self-contained: epaths-force
> > > +	@(sed < ${srcdir}/src/epaths.h > epaths.h.$$$$	\
> > > +	  -e 's;${ns_appdir}/;;') &&			\
> > > +	${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
> > 
> > This (or something else in this patch) leads to the src/epaths.h file
> > being invalid.  It starts like this:
> > 
> > * Hey Emacs, this is -*- C -*- code!  */
> > *
> > Copyright (C) 1993, 1995, 1997, 1999, 2001-2021 Free Software
> > Foundation, Inc.
> > 
> > This file is part of GNU Emacs.
> > 
> > 
> > Note the * instead of /* as the comment starter.
> 
> I think this is because EN_NS_SELF_CONTAINED ends up being "yes" on
> systems where it shouldn't.

I guess it's because it defaults to on. That never occurred to me I'm
afraid.

This should fix it:

modified   configure.ac
@@ -6021,12 +6021,12 @@ m4_define
 AC_CONFIG_COMMANDS([src/epaths.h], [
 if test "${opsys}" = "mingw32"; then
   ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32
-elif test "$EN_NS_SELF_CONTAINED" = "yes"; then
+elif test "$HAVE_NS" = "yes" && test "$EN_NS_SELF_CONTAINED" = "yes"; then
   ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-ns-self-contained
 else
   ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force
 fi || AC_MSG_ERROR(['src/epaths.h' could not be made.])
-], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"
+], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys" HAVE_NS="$HAVE_NS"
     EN_NS_SELF_CONTAINED="$EN_NS_SELF_CONTAINED"])

-- 
Alan Third

Re: master 5dd2d50: Fix NS native compilation builds

[Lars Ingebrigtsen]

Alan Third <alan@idiocy.org> writes:

> This should fix it:

Yup; that fixed the build.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master 5dd2d50: Fix NS native compilation builds

[Alan Third]

On Sat, Jun 26, 2021 at 01:45:46PM +0200, Lars Ingebrigtsen wrote:
> Alan Third <alan@idiocy.org> writes:
> 
> > This should fix it:
> 
> Yup; that fixed the build.

Thanks, I've pushed that change.

-- 
Alan Third