diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2020-05-14 15:39:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-28 18:15:28 +0100 |
commit | 8f45dc87d072f85f2e471a82319a458486a343d8 (patch) | |
tree | 82b7dd153d647c7608fa34fd054886a203be6e88 /meta | |
parent | a7098495ceec355daab193de8fe67c60c12704ef (diff) | |
download | poky-8f45dc87d072f85f2e471a82319a458486a343d8.tar.gz |
bison: fix the parallel build
Explicitly make the BUILT_SOURCES which
are the generated headers such as stdio.h,
fcntl.h and etc to be the dependencies of
the gl_LIBOBJS such as libbison_a-sprintf.o,
libbison_a-printf.o and etc to guarantee the
BUILT_SOURCES is generated before begin to
compile EXTRA_lib_libbison_a_SOURCES such as
fprintf.c in parallel builid, otherwise there
may come below error:
| muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf'
It does the same for src_bison_OBJECTS and
lib_libbison_a_OBJECTS to make sure BUILT_SOURCES
generated before begin to compile src_bison_SOURCES
which contains AnnotationList.c and etc.
BTW, the MOSTLYCLEANFILES also contains the
generated header needs to be created early
in the build process, so add it also in to
avoid below error:
| ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory
[YOCTO #13825]
(From OE-Core rev: 99ddfee2a2434d282749e2062987067f70b0ef54)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit 43d74b11095092b13f94074785d0306484fabea6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch | 63 | ||||
-rw-r--r-- | meta/recipes-devtools/bison/bison_3.5.3.bb | 1 |
2 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch b/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch new file mode 100644 index 0000000000..c3be91a109 --- /dev/null +++ b/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From e0dbcee6e25b3c0cb11a627bbfe3af45ef67ec30 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Thu, 14 May 2020 15:23:16 +0800 | ||
4 | Subject: [PATCH] bison: fix the parallel build | ||
5 | |||
6 | Explicitly make the BUILT_SOURCES which | ||
7 | are the generated headers such as stdio.h, | ||
8 | fcntl.h and etc to be the dependencies of | ||
9 | the gl_LIBOBJS such as libbison_a-sprintf.o, | ||
10 | libbison_a-printf.o and etc to guarantee the | ||
11 | BUILT_SOURCES is generated before begin to | ||
12 | compile EXTRA_lib_libbison_a_SOURCES such as | ||
13 | fprintf.c in parallel builid, otherwise there | ||
14 | may come below error: | ||
15 | | muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf' | ||
16 | |||
17 | It does the same for src_bison_OBJECTS and | ||
18 | lib_libbison_a_OBJECTS to make sure BUILT_SOURCES | ||
19 | generated before begin to compile src_bison_SOURCES | ||
20 | which contains AnnotationList.c and etc. | ||
21 | |||
22 | BTW, the MOSTLYCLEANFILES also contains the | ||
23 | generated header needs to be created early | ||
24 | in the build process, so add it also in to | ||
25 | avoid below error: | ||
26 | | ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory | ||
27 | |||
28 | Upstream-Status: Submitted [bison-patches@gnu.org maillist] | ||
29 | |||
30 | Signed-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 | |||
36 | diff --git a/lib/gnulib.mk b/lib/gnulib.mk | ||
37 | index 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 | |||
49 | diff --git a/src/local.mk b/src/local.mk | ||
50 | index 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 | -- | ||
62 | 2.17.1 | ||
63 | |||
diff --git a/meta/recipes-devtools/bison/bison_3.5.3.bb b/meta/recipes-devtools/bison/bison_3.5.3.bb index 27e09434f8..36c29fe4df 100644 --- a/meta/recipes-devtools/bison/bison_3.5.3.bb +++ b/meta/recipes-devtools/bison/bison_3.5.3.bb | |||
@@ -12,6 +12,7 @@ DEPENDS = "bison-native flex-native" | |||
12 | SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ | 12 | SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ |
13 | file://dont-depend-on-help2man.patch.patch \ | 13 | file://dont-depend-on-help2man.patch.patch \ |
14 | file://add-with-bisonlocaledir.patch \ | 14 | file://add-with-bisonlocaledir.patch \ |
15 | file://0001-bison-fix-the-parallel-build.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[sha256sum] = "2bf85b5f88a5f2fa8069aed2a2dfc3a9f8d15a97e59c713e3906e5fdd982a7c4" | 17 | SRC_URI[sha256sum] = "2bf85b5f88a5f2fa8069aed2a2dfc3a9f8d15a97e59c713e3906e5fdd982a7c4" |
17 | 18 | ||