MonetDB: Dec2011 - Remove dependency on the lockfile program for...

[Sjoerd Mullender]

Changeset: c7f8e5af6d24 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7f8e5af6d24
Modified Files:
        buildtools/conf/rules.mk
        configure.ag
Branch: Dec2011
Log Message:

Remove dependency on the lockfile program for parallel building.
We now no longer need procmail as a prerequisite for parallel builds.


diffs (49 lines):

diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -26,7 +26,7 @@ MX = $(top_builddir)/buildtools/Mx/Mx
 # first, also with bison-generated files.  This is crucial
 # to prevent inconsistent (re-)definitions of macros.
 %.tab.c: %.y
-       $(LOCKFILE) waiting
+       touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do 
sleep 1; done && rm waiting.$$$$
        $(YACC) $(YFLAGS) $(AM_YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
        if [ -f y.tab.c ]; then $(MV) y.tab.c $*.tab.c ; fi
        $(MV) $*.tab.c $*.tab.c.tmp
@@ -37,14 +37,14 @@ MX = $(top_builddir)/buildtools/Mx/Mx
        $(RM) waiting
 
 %.tab.h: %.y
-       $(LOCKFILE) waiting
+       touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do 
sleep 1; done && rm waiting.$$$$
        $(YACC) $(YFLAGS) $(AM_YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
        if [ -f y.tab.h ]; then $(MV) y.tab.h $*.tab.h ; fi
        [ ! -f y.tab.c ] || $(RM) y.tab.c
        $(RM) waiting
 
 %.yy.c: %.l
-       $(LOCKFILE) waiting
+       touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do 
sleep 1; done && rm waiting.$$$$
        $(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
        if [ -f $(LEX_OUTPUT_ROOT).c ]; then $(MV) $(LEX_OUTPUT_ROOT).c $*.yy.c 
; fi
        $(MV) $*.yy.c $*.yy.c.tmp
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1203,7 +1203,6 @@ AC_PATH_PROG(BASH,bash, /usr/bin/bash, $
 AC_CHECK_PROG(RM,rm,rm -f)
 AC_CHECK_PROG(MV,mv,mv -f)
 AC_PROG_LN_S
-AC_CHECK_PROG(LOCKFILE,lockfile,lockfile -r 2,echo)
 
 AC_CHECK_PROGS(RPMBUILD,rpmbuild rpm)
 
@@ -3139,8 +3138,3 @@ case "`make -v 2>&1`" in
        echo
        ;;
 esac
-
-if test x"$LOCKFILE" = x"echo" ; then
-       echo "'lockfile' not found (usually part of a package named procmail)"
-       echo "Please do NOT parallelise the build process! (use -j1 with make)"
-fi
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list