X-Authentication-Warning: delorie.com: mail set sender to djgpp-workers-bounces using -f
X-Recipient: djgpp-workers AT delorie DOT com
Date: Sun, 27 Sep 2009 18:33:35 +0200
From: Eli Zaretskii <eliz AT gnu DOT org>
Subject: Re: [psmith AT gnu DOT org: GNU make: Next release schedule.]
In-reply-to: <200909180020.01762.juan.guerrero@gmx.de>
X-012-Sender: halo1 AT inter DOT net DOT il
To: Juan Manuel Guerrero <juan DOT guerrero AT gmx DOT de>
Cc: bug-make AT gnu DOT org, djgpp-workers AT delorie DOT com
Message-id: <83ab0gs5y8.fsf@gnu.org>
References: <83vdjiwrgs DOT fsf AT gnu DOT org> <200909180020 DOT 01762 DOT juan DOT guerrero AT gmx DOT de>
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

> From: Juan Manuel Guerrero <juan DOT guerrero AT gmx DOT de>
> Date: Fri, 18 Sep 2009 00:20:00 +0200
> Cc: Eli Zaretskii <eliz AT gnu DOT org>,
>  djgpp-workers AT delorie DOT com
> 
> This patch contains the changes required to compile and run the testsuite
> using DJGPP.  It is basicaly the same that I have submitted almost two years
> ago.  I have removed the part to fix the broken path support for MSDOS/WINDOWS
> because this has already been fixed.
> For a description of what the patch was supposed to fix in its original version
> see:
> <http://lists.gnu.org/archive/html/bug-make/2008-01/msg00008.html>
> <http://lists.gnu.org/archive/html/bug-make/2008-06/msg00059.html>
> 
> 
> Regards,
> Juan M. Guerrero

Thanks.  I committed these parts:

> 	* configh.dos.template: Remove unconditional definition of SYS_SIGLIST_DECLARED.
> 	Include <sys/version.h> because ports of GCC 4.3.0 and later no longer
> 	include it, so macros like __DJGPP_MINOR__ are no longer defined automatically.
> 
> 	* Makefile.DOS.template (INCLUDES): Use $(prefix) and the corresponding
> 	variables to define LIBDIR, INCLUDEDIR and LOCALEDIR instead of using
> 	the hardcoded ones.
> 	(SUBDIRS): doc subdir added.
> 	(INFO_DEPS, DVIS): Values changed to 'make.info' and 'make.dvi'.
> 	(TEXI2HTML, TEXI2HTML_FLAGS): Removed.  Use makeinfo --html to
> 	create html formated docs.  texi2html may not be ported to DOS.
> 	(make.info, make.dvi, make.ps, make.html): Make targets depend on
> 	'make.texi'.
> 	(.texi.info, .texi, .texi.dvi): Now recursively invocate.  Change
> 	-I switch to look in ./ instead of ./doc.
> 	(html): Target depend on html-recursive instead of make_1.html.
> 	(make_1.html): Removed.
> 	(mostlyclean-aminfo): Use $(srcdir)/doc instead of ./ as prefix.
> 	(all-recursive): Allow for more than one subdir in the build process.
> 	(mostlyclean-recursive, clean-recursive, distclean-recursive,
> 	maintainer-clean-recursive, check-recursive): Enter in doc/ too.
> 	(tags-recursive): Allow for more than one subdir in the build process.
> 	(info-recursive, dvi-recursive, ps-recursive, html-recursive): New
> 	targets.  Enter into doc/ to produce the targets.
> 	(all-am): $(INFO_DEPS) replaced by info.

I did not yet commit the changes in the tests/ directory, since I'm
not sure how the discussion between Paul and Juan ended.  Any
conclusions about that?

I also didn't yet commit the small patch for glob/glob.c (patch
reproduced below).  Paul, is it possible to ask glob.c maintainers to
apply this patch, so as to avoid divergence from the upstream version?

Thanks.

> 	* glob/glob.c (my_realloc): Don't define, and don't redefine realloc
> 	to call it since the DJGPP realloc handles NULL pointers.

> Index: glob/glob.c
> ===================================================================
> RCS file: /sources/make/make/glob/glob.c,v
> retrieving revision 1.28
> diff -u -r1.28 glob.c
> --- glob/glob.c	22 Dec 2007 11:28:49 -0000	1.28
> +++ glob/glob.c	17 Sep 2009 19:54:09 -0000
> @@ -182,7 +182,7 @@
>  # define mempcpy(Dest, Src, Len) __mempcpy (Dest, Src, Len)
>  #endif
>  
> -#ifndef	__GNU_LIBRARY__
> +#if !defined __GNU_LIBRARY__ && !defined __DJGPP__
>  # ifdef	__GNUC__
>  __inline
>  # endif
> @@ -190,9 +190,6 @@
>  #  ifdef WINDOWS32
>  static void *
>  my_realloc (void *p, unsigned int n)
> -#  elif defined(__DJGPP__)
> -static void *
> -my_realloc (void *p, size_t n)
>  #  else
>  static char *
>  my_realloc (p, n)
> @@ -208,7 +205,7 @@
>  }
>  # define	realloc	my_realloc
>  # endif /* __SASC */
> -#endif /* __GNU_LIBRARY__ */
> +#endif /* __GNU_LIBRARY__ || __DJGPP__ */
>  
>  
>  #if !defined __alloca && !defined __GNU_LIBRARY__