Re: [PATCH][BZ #16037] configure: allow building with GNU Make 4

[Allan McRae <allan at archlinux dot org>]

On 12/10/13 22:48, Allan McRae wrote:
> On 10/10/13 22:24, Thomas Schwinge wrote:
>> Hi!
>>
>> On Thu, 10 Oct 2013 09:47:47 +0200, Andreas Jaeger <aj@suse.com> wrote:
>>> On 10/10/2013 07:26 AM, Marc-Antoine Perennou wrote:
>>>> Currently, configure errors telling make 4 is too old
>>>> since it does not match our regexp.
>>>
>>> Does glibc build correctly with make 4?
>>
>> For such things, I suggest Âbuild correctly to mean: the output produced
>> by building, installing, and testing it is identicaly to before, or any
>> differences can be explained.
>>
>> And, I suggest that Âoutput produced both includes the direct build
>> artifacts (.o files, and so on), and also the stdout/stderr log of the
>> build (for this, of course, it makes sense to use make -j1).
> 
> 
> I have attached a diff of build logs with make-3.82 and make-4.0.
> 
> The main "differences" are that make-3 uses a ` in its output whereas
> make-4 uses a '.  Make-4 also does not print entering/leaving notices
> when it does nothing in that directory.  I have filtered most of these
> out, but you will see examples of the latter in the attached output.
> 
> The first difference is a rebuilding of C-translit.h.  I believe that
> this should not happen...
> 
> The second real differences involves librtld.mk.  I have no idea what
> this is, so someone else will need to comment on that.
> 
> Finally, there are a couple of small differences at the end where gcc is
> called.  I build glibc with "build-programs=no" first, then add
> hardening cflags to build the binaries.  It looks like make-3 is doing
> some unnecessary work in the second make call that make-4 is not doing.
> 


The librtld.mk differences that I pointed out seem to be also due to it
being regenerated a second time in the build I did using make-3.  So
there are no real differences in the make output with make-4.0.

I have also updated the original patch to include versions beyond 4.x.
OK to commit?


ChangeLog:

2013-xx-xx  Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

	[BZ #16037]
	* configure.ac: allow GNU Make 4.0 and greater.
	* configure: Regenerated.


diff --git a/configure.ac b/configure.ac
index 527af96..172180b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -990,7 +990,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc
${ac_tool_prefix}cc, -v,
   critic_missing="$critic_missing gcc")
 AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
-  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*],
critic_missing="$critic_missing make")

 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
   [GNU gettext.* \([0-9]*\.[0-9.]*\)],