mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-24 10:54:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't assume -j is a solo 'make' argument.

Browse Source
This commit is contained in:
Paul Eggert 2003-10-09 20:23:53 +00:00
parent 87f8817fdc
commit 132dcb2111
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,9 @@
2003-10-09 Paul Eggert <eggert@twinsun.com>
* lib/Autom4te/XFile.pm: Don't assume -j is solo.
Issue a more-informative diagnostic.
Problems reported by Eric Sunshine.
2003-10-08 Steven G. Johnson <stevenj@alum.mit.edu> 2003-10-08 Steven G. Johnson <stevenj@alum.mit.edu>
* lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Omit quoted * lib/autoconf/fortran.m4 (_AC_PROG_FC_V_OUTPUT): Omit quoted
@ -66,7 +72,7 @@
2003-10-02 Akim Demaille <akim@epita.fr> 2003-10-02 Akim Demaille <akim@epita.fr>
* bin/ifnames.in (&scan_file): Skip C++ comments. * bin/ifnames.in (&scan_file): Skip C++ comments.
From Jeremy Yallop. From Jeremy Yallop.
2003-10-01 Pavel Roskin <proski@gnu.org> 2003-10-01 Pavel Roskin <proski@gnu.org>
@ -183,8 +189,8 @@
Paul Eggert <eggert@twinsun.com> Paul Eggert <eggert@twinsun.com>
Trivial change to support GCC's configuration procedure. Trivial change to support GCC's configuration procedure.
* lib/autoconf/c.m4 (AC_PROG_CPP_WERROR): New macro. * lib/autoconf/c.m4 (AC_PROG_CPP_WERROR): New macro.
* lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL): Don't warn * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL): Don't warn
about inconsistency if the preprocessor is set to give errors for about inconsistency if the preprocessor is set to give errors for
any warning. any warning.
* doc/autoconf.texi (C Compiler Characteristics): Document this. * doc/autoconf.texi (C Compiler Characteristics): Document this.
@ -714,7 +720,7 @@
White spaces cleanup. White spaces cleanup.
2003-05-22 Jim Meyering <jim@meyering.net> 2003-05-22 Jim Meyering <jim@meyering.net>
and Paul Eggert <eggert@twinsun.com> Paul Eggert <eggert@twinsun.com>
* lib/autoconf/c.m4 (_AC_PROG_CXX_EXIT_DECLARATION): * lib/autoconf/c.m4 (_AC_PROG_CXX_EXIT_DECLARATION):
Remove `#include <stdlib.h>' from the list; we should never Remove `#include <stdlib.h>' from the list; we should never
@ -4285,7 +4291,7 @@
`{}'. `{}'.
* lib/autotest/general.m4 (AT_INIT): Adjust. * lib/autotest/general.m4 (AT_INIT): Adjust.
2001-09-18 Paul Wagland <paul@wagland.net> 2001-09-18 Paul Wagland <paul@wagland.net>
* tests/m4sh.at: Ensure that AS_DIRNAME handles '/', '//' and '///' * tests/m4sh.at: Ensure that AS_DIRNAME handles '/', '//' and '///'
correctly. correctly.

9
lib/Autom4te/XFile.pm
View File

@ -223,12 +223,15 @@ sub lock
# perl was not built with -Ud_flock. Normally, this problem is harmless, # perl was not built with -Ud_flock. Normally, this problem is harmless,
# so ignore the ENOLCK errors that are reported in that situation, # so ignore the ENOLCK errors that are reported in that situation,
# However, if the invoker is using "make -j", the problem is not harmless, # However, if the invoker is using "make -j", the problem is not harmless,
# so report it in that case. Admittedly this is a bit of a hack. # so report it in that case, by inspecting MAKEFLAGS and looking for
# any arguments indicating that the invoker used -j.
# Admittedly this is a bit of a hack.
if (!flock ($fh, $mode) if (!flock ($fh, $mode)
&& (!$!{ENOLCK} || " $ENV{'MAKEFLAGS'}" =~ / (-j|--jobs)/)) && (!$!{ENOLCK}
|| " -$ENV{'MAKEFLAGS'}" =~ / (-[BdeikrRsSw]*j|---?jobs)/))
{ {
my $file = $fh->name; my $file = $fh->name;
fatal "cannot lock $file with mode $mode: $!"; fatal "cannot lock $file with mode $mode (perhaps you are running make -j on a lame NFS client?): $!";
} }
} }