various bugs in 21.3.50 found during Cygwin port

various bugs in 21.3.50 found during Cygwin port

[Joe Buehler]

Here are some things I found while moving the 21.2 Cygwin patches to
21.3.50 (i.e. the CVS version).

1. There are some places in the Makefiles that run emacs during "make bootstrap"
but emacs cannot find the lisp files it needs.  There is already a setting
for $(emacs) that sets EMACSLOADPATH, so I used that and it worked.

2. x-win.el will not byte-compile when making a non-X11 emacs,
because it references functions in fontset.c, which is not compiled
when not making an X11 emacs.  I am ignoring errors in byte-compiles
at the moment (no patch included here).

3. There is an _P macro in pop.c that conflicts with a cygwin header file.

4. LOGNAME is not defined on Cygwin systems.  USERNAME is, so I use that if
LOGNAME is not set.  It is not clear to me why one would want to
do "chown $LOGNAME" in the first place, though.

Joe Buehler

--- lisp/Makefile.in	2002-11-20 02:15:41.000000000 -0500
+++ lisp/Makefile.in	2002-12-04 16:28:45.000000000 -0500
@@ -166,7 +166,7 @@
  autoloads: loaddefs.el doit
  	wd=$(lisp); $(setwins); \
  	echo Directories: $$wins; \
-	$(EMACS) $(EMACSOPT) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
+	$(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins

  subdirs.el:
  	$(MAKE) $(MFLAGS) update-subdirs
--- lisp/Makefile.in	2002-11-20 02:15:41.000000000 -0500
+++ lisp/Makefile.in	2002-12-04 16:28:45.000000000 -0500
@@ -146,12 +146,12 @@
  custom-deps: cus-load.el doit
  	wd=$(lisp); $(setwins_almost); \
  	echo Directories: $$wins; \
-	$(EMACS) $(EMACSOPT) -l cus-dep -f custom-make-dependencies $$wins
+	$(emacs) -l cus-dep -f custom-make-dependencies $$wins

  finder-data: doit
  	wd=$(lisp); $(setwins_almost); \
  	echo Directories: $$wins; \
-	$(EMACS) $(EMACSOPT) -l finder -f finder-compile-keywords-make-dist $$wins
+	$(emacs) -l finder -f finder-compile-keywords-make-dist $$wins

  loaddefs.el:
  	echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@
@@ -270,7 +270,7 @@
  # .elc is present.

  recompile: doit
-	$(EMACS) $(EMACSOPT) -f batch-byte-recompile-directory $(lisp)
+	$(emacs) -f batch-byte-recompile-directory $(lisp)

  # Prepare a bootstrap in the lisp subdirectory.  Build loaddefs.el,
  # because it's not sure it's up-to-date, and if it's not, that might
--- lib-src/pop.c	2002-05-17 07:24:02.000000000 -0400
+++ lib-src/pop.c	2002-12-04 20:50:26.000000000 -0500
@@ -119,6 +119,9 @@
  #endif
  #endif

+#ifdef _P
+#undef _P
+#endif
  #ifndef _P
  # ifdef __STDC__
  #  define _P(a) a
--- Makefile.in	2002-11-11 04:03:08.000000000 -0500
+++ Makefile.in	2002-12-05 08:09:24.000000000 -0500
@@ -397,7 +397,7 @@
  	      (cd $${dir}; tar -chf - . ) \
  		| (cd $${dest}; umask 022; \
                     tar -xvf - && cat > /dev/null) || exit 1; \
-	      find $${dest} -exec chown $$LOGNAME {} ';' ;\
+	      find $${dest} -exec chown $${LOGNAME:-$$USERNAME} {} ';' ;\
  	      for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
  		chmod a+rx $${subdir} ; \
  		rm -rf $${subdir}/RCS ; \
@@ -436,7 +436,7 @@
  	   echo "Copying etc/DOC-* to ${docdir} ..." ; \
  	   (cd ./etc; tar -chf - DOC*) \
  	     |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
-	   (cd $(docdir); chown $${LOGNAME} DOC*; chmod a+r DOC*; \
+	   (cd $(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
  	    if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
  	else true; fi
  	-unset CDPATH; \
@@ -447,7 +447,7 @@
  	   echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
  	   (cd ${srcdir}/lisp; tar -chf - *.el *.elc) \
  	     |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
-	   (cd ${lispdir}; find . -exec chown $${LOGNAME} {} ';') ; \
+	   (cd ${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; \
  	else true; fi
  	-unset CDPATH; \
  	thisdir=`/bin/pwd`; \

Re: various bugs in 21.3.50 found during Cygwin port

[Eli Zaretskii]

> From: Joe Buehler <jbuehler@hekimian.com>
> Date: Thu, 05 Dec 2002 11:12:50 -0500
> 
> 1. There are some places in the Makefiles that run emacs during "make bootstrap"
> but emacs cannot find the lisp files it needs.  There is already a setting
> for $(emacs) that sets EMACSLOADPATH, so I used that and it worked.

I don't understand why is this required for Cygwin; the curent
version of lisp/Makefile.in works for every other platform.

Your change breaks the DJGPP (a.k.a. MS-DOS) port.

Re: various bugs in 21.3.50 found during Cygwin port

[Joe Buehler]

Eli Zaretskii wrote:

> 1. There are some places in the Makefiles that run emacs during "make bootstrap"
> but emacs cannot find the lisp files it needs.  There is already a setting
> for $(emacs) that sets EMACSLOADPATH, so I used that and it worked.
> 
> 
> I don't understand why is this required for Cygwin; the curent
> version of lisp/Makefile.in works for every other platform.
> 
> Your change breaks the DJGPP (a.k.a. MS-DOS) port.

Perhaps it is CANNOT_DUMP?

Perhaps it is because I am not building in the source tree?

Joe Buehler

Re: various bugs in 21.3.50 found during Cygwin port

[Andreas Schwab]

Joe Buehler <jbuehler@hekimian.com> writes:

|> Perhaps it is because I am not building in the source tree?

That shouldn't be an issue, I'm also doing it myself without problems.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: various bugs in 21.3.50 found during Cygwin port

[Eli Zaretskii]

> From: Joe Buehler <jbuehler@hekimian.com>
> Date: Thu, 05 Dec 2002 14:38:29 -0500
> 
> > I don't understand why is this required for Cygwin; the curent
> > version of lisp/Makefile.in works for every other platform.
> > 
> > Your change breaks the DJGPP (a.k.a. MS-DOS) port.
> 
> Perhaps it is CANNOT_DUMP?
> 
> Perhaps it is because I am not building in the source tree?

The latter, IIRC.