diff options
Diffstat (limited to 'poky/meta/recipes-devtools/bison')
-rw-r--r-- | poky/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch | 63 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch | 44 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/bison/bison_3.7.2.bb (renamed from poky/meta/recipes-devtools/bison/bison_3.5.4.bb) | 14 |
3 files changed, 3 insertions, 118 deletions
diff --git a/poky/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch b/poky/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch deleted file mode 100644 index c3be91a10..000000000 --- a/poky/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -From e0dbcee6e25b3c0cb11a627bbfe3af45ef67ec30 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Thu, 14 May 2020 15:23:16 +0800 -Subject: [PATCH] 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 - -Upstream-Status: Submitted [bison-patches@gnu.org maillist] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - lib/gnulib.mk | 2 ++ - src/local.mk | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/lib/gnulib.mk b/lib/gnulib.mk -index c21c656..27fb3dc 100644 ---- a/lib/gnulib.mk -+++ b/lib/gnulib.mk -@@ -120,6 +120,8 @@ lib_libbison_a_SOURCES = - lib_libbison_a_LIBADD = $(gl_LIBOBJS) - lib_libbison_a_DEPENDENCIES = $(gl_LIBOBJS) - EXTRA_lib_libbison_a_SOURCES = -+$(lib_libbison_a_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h) -+$(gl_LIBOBJS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h) - - lib_libbison_a_CPPFLAGS = $(AM_CPPFLAGS) -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\" - -diff --git a/src/local.mk b/src/local.mk -index 61dc573..b5b9079 100644 ---- a/src/local.mk -+++ b/src/local.mk -@@ -24,6 +24,7 @@ if RELOCATABLE_VIA_LD - src_bison_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)` - endif - -+$(src_bison_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h) - src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS) - src_bison_SOURCES = \ - src/AnnotationList.c \ --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch b/poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch deleted file mode 100644 index 8a41a3a76..000000000 --- a/poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 31bb81ef15c42b10844eb8af8738f672076edf0e Mon Sep 17 00:00:00 2001 -From: Marko Lindqvist <cazfi74@gmail.com> -Date: Tue, 21 Apr 2015 00:48:45 -0700 -Subject: [PATCH] doc/local.mk: dont-depend-on-help2man.patch - -Upstream-Status: Inappropriate - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> - -Updated for bison 3.0.4 - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- - doc/local.mk | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/doc/local.mk b/doc/local.mk -index d12836e..f9bf332 100644 ---- a/doc/local.mk -+++ b/doc/local.mk -@@ -101,10 +101,7 @@ endif ! CROSS_COMPILING - ## Man Pages. ## - ## ----------- ## - --dist_man_MANS = $(top_srcdir)/doc/bison.1 -- --EXTRA_DIST += $(dist_man_MANS:.1=.x) --MAINTAINERCLEANFILES += $(dist_man_MANS) -+EXTRA_DIST += bison.x - - # Differences to ignore when comparing the man page (the date). - remove_time_stamp = \ -@@ -127,10 +124,6 @@ $(top_srcdir)/doc/bison.1: $(MAN_DEPS) - fi - $(AM_V_at)rm -f $@*.tmp - --if ENABLE_YACC --nodist_man_MANS = doc/yacc.1 --endif -- - ## ----------------------------- ## - ## Graphviz examples generation. ## - ## ----------------------------- ## diff --git a/poky/meta/recipes-devtools/bison/bison_3.5.4.bb b/poky/meta/recipes-devtools/bison/bison_3.7.2.bb index 124bc41d3..ace4ea5c3 100644 --- a/poky/meta/recipes-devtools/bison/bison_3.5.4.bb +++ b/poky/meta/recipes-devtools/bison/bison_3.7.2.bb @@ -10,25 +10,17 @@ SECTION = "devel" DEPENDS = "bison-native flex-native" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ - file://dont-depend-on-help2man.patch.patch \ file://add-with-bisonlocaledir.patch \ - file://0001-bison-fix-the-parallel-build.patch \ -" -SRC_URI[sha256sum] = "4c17e99881978fa32c05933c5262457fa5b2b611668454f8dc2a695cd6b3720c" + " +SRC_URI[sha256sum] = "7948d193104d979c0fb0294a1854c73c89d72ae41acfc081826142578a78a91b" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -# Reset any loadavg set via environment, it breaks parallel build -# | ../bison-3.5.2/lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory -# | #include "uniwidth.h" -# | ^~~~~~~~~~~~ -EXTRA_OEMAKE_append = " -l" - inherit autotools gettext texinfo # The automatic m4 path detection gets confused, so force the right value -acpaths = "-I ${S}/m4" +acpaths = "-I ./m4" do_compile_prepend() { for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done |