blob: c3be91a109719c9ca979d866ba3df8ee17dba2f6 [file] [log] [blame]
Andrew Geissler1e34c2d2020-05-29 16:02:59 -05001From e0dbcee6e25b3c0cb11a627bbfe3af45ef67ec30 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 14 May 2020 15:23:16 +0800
4Subject: [PATCH] bison: fix the parallel build
5
6Explicitly make the BUILT_SOURCES which
7are the generated headers such as stdio.h,
8fcntl.h and etc to be the dependencies of
9the gl_LIBOBJS such as libbison_a-sprintf.o,
10libbison_a-printf.o and etc to guarantee the
11BUILT_SOURCES is generated before begin to
12compile EXTRA_lib_libbison_a_SOURCES such as
13fprintf.c in parallel builid, otherwise there
14may come below error:
15 | muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf'
16
17It does the same for src_bison_OBJECTS and
18lib_libbison_a_OBJECTS to make sure BUILT_SOURCES
19generated before begin to compile src_bison_SOURCES
20which contains AnnotationList.c and etc.
21
22BTW, the MOSTLYCLEANFILES also contains the
23generated header needs to be created early
24in the build process, so add it also in to
25avoid below error:
26 | ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory
27
28Upstream-Status: Submitted [bison-patches@gnu.org maillist]
29
30Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
31---
32 lib/gnulib.mk | 2 ++
33 src/local.mk | 1 +
34 2 files changed, 3 insertions(+)
35
36diff --git a/lib/gnulib.mk b/lib/gnulib.mk
37index c21c656..27fb3dc 100644
38--- a/lib/gnulib.mk
39+++ b/lib/gnulib.mk
40@@ -120,6 +120,8 @@ lib_libbison_a_SOURCES =
41 lib_libbison_a_LIBADD = $(gl_LIBOBJS)
42 lib_libbison_a_DEPENDENCIES = $(gl_LIBOBJS)
43 EXTRA_lib_libbison_a_SOURCES =
44+$(lib_libbison_a_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
45+$(gl_LIBOBJS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
46
47 lib_libbison_a_CPPFLAGS = $(AM_CPPFLAGS) -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\"
48
49diff --git a/src/local.mk b/src/local.mk
50index 61dc573..b5b9079 100644
51--- a/src/local.mk
52+++ b/src/local.mk
53@@ -24,6 +24,7 @@ if RELOCATABLE_VIA_LD
54 src_bison_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
55 endif
56
57+$(src_bison_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
58 src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
59 src_bison_SOURCES = \
60 src/AnnotationList.c \
61--
622.17.1
63