summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-17 22:30:18 +0000
committerKarl Berry <karl@freefriends.org>2022-01-17 22:30:18 +0000
commitf6e872310c76f0cabbdeb6367c5c2fe30f3c4b3c (patch)
tree2bdc95af4cadc92eaaa6c3ac9a7a00418c970355
parent8a204f51dc5e973b9d8c1d559c4ff334e0eef023 (diff)
avoid libweb2c.a parallel build
git-svn-id: svn://tug.org/texlive/trunk@61639 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ChangeLog7
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog19
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.am12
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.in10
4 files changed, 27 insertions, 21 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index f9e6331d364..d20e119e5c7 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -2,13 +2,6 @@
* weave.ch: Add a third layer to 'byte_mem'.
-2022-01-15 Karl Berry <karl@freefriends.org>
-
- * web2c/Makefile.am (web2c_LDADD): set to libweb2c.a
- instead of -L. -lweb2c, for compatibility with slibtool,
- and clarity. Report from Michael Orlitzky,
- tex-k 15 Jan 2022 13:28:41.
-
2022-01-15 Andreas Scherer <https://ascherer.github.io>
* tangle.ch,
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index c77eed13c96..0d1904d68a2 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,22 @@
+2022-01-17 Karl Berry <karl@freefriends.org>
+
+ * Makefile.am (web2c_DEPENDENCIES),
+ (fixwrites_DEPENDENCIES),
+ (splitup_DEPENDENCIES): set empty, so that Automake doesn't
+ try to build libweb2c.a (what they'd be set to otherwise) in
+ parallel. This is probably why -L -lweb2c was used. Found by
+ Michael Orlitzky, https://tug.org/pipermail/tlbuild/2022q1/005021.html.
+
+ Why all the stamp files are needed still seems mysterious,
+ but moving on ...
+
+2022-01-15 Karl Berry <karl@freefriends.org>
+
+ * Makefile.am (web2c_LDADD): set to libweb2c.a
+ instead of -L. -lweb2c, for compatibility with slibtool,
+ and clarity. Report from Michael Orlitzky,
+ tex-k 15 Jan 2022 13:28:41.
+
2022-01-06 Andreas Scherer <https://ascherer.github.io>
* common.defines: New TWILLHELP.
diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am
index eeebf0764b7..b11f256cc84 100644
--- a/Build/source/texk/web2c/web2c/Makefile.am
+++ b/Build/source/texk/web2c/web2c/Makefile.am
@@ -48,31 +48,27 @@ libweb2c_a_SOURCES = \
kps.c
$(libweb2c_a_OBJECTS): w2c/config.h
-
web2c_SOURCES = \
web2c-parser.y \
web2c-lexer.l \
main.c \
web2c.h
-
$(web2c_OBJECTS): web2c-parser.h stamp-lib
-
+web2c_DEPENDENCIES = # don't build libweb2c.a in parallel
web2c_LDADD = libweb2c.a
-
+#
DISTCLEANFILES += web2c-parser.output
fixwrites_SOURCES = \
fixwrites.c
-
$(fixwrites_OBJECTS): stamp-lib
-
+fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel
fixwrites_LDADD = $(web2c_LDADD)
splitup_SOURCES = \
splitup.c
-
$(splitup_OBJECTS): stamp-lib
-
+splitup_DEPENDENCIES = # don't build libweb2c.a in parallel
splitup_LDADD = $(web2c_LDADD)
makecpool_SOURCES = \
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 8adcc067507..62ea948a8fd 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -127,7 +127,6 @@ am_libweb2c_a_OBJECTS = kps.$(OBJEXT)
libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
-fixwrites_DEPENDENCIES = $(web2c_LDADD)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -137,11 +136,9 @@ makecpool_OBJECTS = $(am_makecpool_OBJECTS)
makecpool_LDADD = $(LDADD)
am_splitup_OBJECTS = splitup.$(OBJEXT)
splitup_OBJECTS = $(am_splitup_OBJECTS)
-splitup_DEPENDENCIES = $(web2c_LDADD)
am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
main.$(OBJEXT)
web2c_OBJECTS = $(am_web2c_OBJECTS)
-web2c_DEPENDENCIES = libweb2c.a
SCRIPTS = $(dist_noinst_SCRIPTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -395,6 +392,7 @@ AM_YFLAGS = -d -v
AM_CFLAGS = $(WARNING_CFLAGS)
EXTRA_LIBRARIES = libweb2c.a
BUILT_SOURCES = w2c/config.h
+#
DISTCLEANFILES = w2c/config.h web2c-parser.output
noinst_HEADERS = coerce.h
dist_noinst_SCRIPTS = convert
@@ -415,14 +413,17 @@ web2c_SOURCES = \
main.c \
web2c.h
+web2c_DEPENDENCIES = # don't build libweb2c.a in parallel
web2c_LDADD = libweb2c.a
fixwrites_SOURCES = \
fixwrites.c
+fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel
fixwrites_LDADD = $(web2c_LDADD)
splitup_SOURCES = \
splitup.c
+splitup_DEPENDENCIES = # don't build libweb2c.a in parallel
splitup_LDADD = $(web2c_LDADD)
makecpool_SOURCES = \
makecpool.c
@@ -973,11 +974,8 @@ w2c/config.h: ../w2c/config.h
fi
$(libweb2c_a_OBJECTS): w2c/config.h
-
$(web2c_OBJECTS): web2c-parser.h stamp-lib
-
$(fixwrites_OBJECTS): stamp-lib
-
$(splitup_OBJECTS): stamp-lib
stamp-lib: