diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2020-09-15 19:41:31 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-17 09:47:46 +0100 |
| commit | d393196485d490af8397d074e2060540ff41c504 (patch) | |
| tree | 59415bda01bfa75b262de1590d42524a6dea41aa | |
| parent | 812c2dbabf8349ff5ed6ff8734c4ffea24b0e341 (diff) | |
| download | poky-d393196485d490af8397d074e2060540ff41c504.tar.gz | |
bison: remove the parallel build patch
Remove the parallel build patch and related fix for parallel
build as the issue have already been fixed in bison 3.7.2
(f7b642cf build: fix incorrect dependencies).
(From OE-Core rev: 00c7aacf84d094706ed3378a265189d2d6816cfd)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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.7.2.bb | 7 |
2 files changed, 0 insertions, 70 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 deleted file mode 100644 index c3be91a109..0000000000 --- a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch +++ /dev/null | |||
| @@ -1,63 +0,0 @@ | |||
| 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.7.2.bb b/meta/recipes-devtools/bison/bison_3.7.2.bb index f7bf70fff3..ace4ea5c3f 100644 --- a/meta/recipes-devtools/bison/bison_3.7.2.bb +++ b/meta/recipes-devtools/bison/bison_3.7.2.bb | |||
| @@ -11,19 +11,12 @@ DEPENDS = "bison-native flex-native" | |||
| 11 | 11 | ||
| 12 | SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ | 12 | SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ |
| 13 | file://add-with-bisonlocaledir.patch \ | 13 | file://add-with-bisonlocaledir.patch \ |
| 14 | file://0001-bison-fix-the-parallel-build.patch \ | ||
| 15 | " | 14 | " |
| 16 | SRC_URI[sha256sum] = "7948d193104d979c0fb0294a1854c73c89d72ae41acfc081826142578a78a91b" | 15 | SRC_URI[sha256sum] = "7948d193104d979c0fb0294a1854c73c89d72ae41acfc081826142578a78a91b" |
| 17 | 16 | ||
| 18 | # No point in hardcoding path to m4, just use PATH | 17 | # No point in hardcoding path to m4, just use PATH |
| 19 | EXTRA_OECONF += "M4=m4" | 18 | EXTRA_OECONF += "M4=m4" |
| 20 | 19 | ||
| 21 | # Reset any loadavg set via environment, it breaks parallel build | ||
| 22 | # | ../bison-3.5.2/lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory | ||
| 23 | # | #include "uniwidth.h" | ||
| 24 | # | ^~~~~~~~~~~~ | ||
| 25 | EXTRA_OEMAKE_append = " -l" | ||
| 26 | |||
| 27 | inherit autotools gettext texinfo | 20 | inherit autotools gettext texinfo |
| 28 | 21 | ||
| 29 | # The automatic m4 path detection gets confused, so force the right value | 22 | # The automatic m4 path detection gets confused, so force the right value |
