xindy-new build problems

git-svn-id: svn://tug.org/texlive/trunk@16270 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 33 insertions, 2 deletions

diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/ChangeLog b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/ChangeLog
index faa488e0ca6..1c3fd060e0e 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-12-parallel (new): More parallel build problems.
+
 2009-11-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-10-superfluous (new): Remove superfluous part.
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-12-parallel b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-12-parallel
new file mode 100644
index 00000000000..b4182eaf1f6
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-12-parallel
@@ -0,0 +1,20 @@
+	More problems with aggressive parallel builds (make -j).
+
+	The three rules:
+		%-test.xdy : %.pl
+			$(PERL) -I$(srcdir) $< $*
+		%-doc.tex : %.pl
+			$(PERL) -I$(srcdir) $< $*
+		%.xdy :	%.pl
+			$(PERL) -I$(srcdir) $< $*
+	must not run simultaneously or %-test.xdy could be destroyed.
+
+diff -ur -x Makefile.in xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
+--- xindy.orig/make-rules/alphabets/Makefile.am	2009-11-25 14:01:03.000000000 +0100
++++ xindy/make-rules/alphabets/Makefile.am	2009-12-02 16:42:50.000000000 +0100
+@@ -1264,3 +1264,5 @@
+ 
+ CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
+ 
++.NOTPARALLEL:
++
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-20-TL-install-dirs b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-20-TL-install-dirs
index 71065e7d1ae..a4e3bc0736a 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-20-TL-install-dirs
+++ b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-20-TL-install-dirs
@@ -40,8 +40,8 @@ diff -ur -x Makefile.in xindy.orig/src/Makefile.am xindy/src/Makefile.am
  # our own rule and the .lib files for the clean definition. Don't use
 diff -ur -x Makefile.in xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
 --- xindy.orig/user-commands/Makefile.am	2009-11-25 14:00:59.000000000 +0100
-+++ xindy/user-commands/Makefile.am	2009-11-29 23:30:23.000000000 +0100
-@@ -20,7 +20,38 @@
++++ xindy/user-commands/Makefile.am	2009-12-02 16:55:04.000000000 +0100
+@@ -20,7 +20,39 @@
  ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  ## Boston, MA 02110-1301 USA.
  
@@ -67,6 +67,7 @@ diff -ur -x Makefile.in xindy.orig/user-commands/Makefile.am xindy/user-commands
 +install-links:
 +	@cd $(DESTDIR)$(bindir) && \
 +	for f in $(scripts); do \
++	  rm -f $$f; \
 +	  echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \
 +	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
 +	done
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
index 427ae5fe0c3..f429aca5341 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
@@ -1264,3 +1264,5 @@ EXTRA_DIST = $(SCRS) test.xdy rom-comma-kludge.sed
 
 CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
 
+.NOTPARALLEL:
+
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
index 96e44d670d5..50096251a61 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
@@ -2594,6 +2594,8 @@ alphabets-inc.tex : $(DOCS)
 @BUILDDOCS_TRUE@@BUILDRULES_TRUE@	pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
 @BUILDDOCS_TRUE@@BUILDRULES_TRUE@	pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
 
+.NOTPARALLEL:
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
index c77629931ef..88b8c0acf1f 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
@@ -41,6 +41,7 @@ install-exec-hook: $(scripts)
 install-links:
 	@cd $(DESTDIR)$(bindir) && \
 	for f in $(scripts); do \
+	  rm -f $$f; \
 	  echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \
 	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
 	done
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
index 37c36c4d290..d9cc6cb11a7 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
@@ -465,6 +465,7 @@ uninstall-man: uninstall-man1
 @TEXLIVE_BUILD_TRUE@install-links:
 @TEXLIVE_BUILD_TRUE@	@cd $(DESTDIR)$(bindir) && \
 @TEXLIVE_BUILD_TRUE@	for f in $(scripts); do \
+@TEXLIVE_BUILD_TRUE@	  rm -f $$f; \
 @TEXLIVE_BUILD_TRUE@	  echo "creating link '$$f -> '$(REL)/$(scriptspath)/$$f.pl"; \
 @TEXLIVE_BUILD_TRUE@	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
 @TEXLIVE_BUILD_TRUE@	done