summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-14 02:07:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:20:26 +0100
commit6787dbc5f391f7fd0b27965cf5985107561f16b0 (patch)
tree3ac84c14bc66212e0632db02f0b5fa5954cedb03 /meta
parent2b49fba71f83de4d0645a7def2d9437a727b6346 (diff)
downloadpoky-6787dbc5f391f7fd0b27965cf5985107561f16b0.tar.gz
bison: 2.7.1 -> 3.0.4
* Based on Chong Lu's previous upgrade to 3.0.2 * Remove unneeded patches: dont-depend-on-help2man.patch and fix_cross_manpage_building.patch (From OE-Core rev: fbb26d8db8e71fd979edd2bafa7e0bab7632950c) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch32
-rw-r--r--meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch19
-rw-r--r--meta/recipes-devtools/bison/bison_3.0.4.bb (renamed from meta/recipes-devtools/bison/bison_2.7.1.bb)22
3 files changed, 10 insertions, 63 deletions
diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
deleted file mode 100644
index 21b44bf79c..0000000000
--- a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Inappropriate
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd bison-2.7/doc/Makefile.am bison-2.7/doc/Makefile.am
5--- bison-2.7/doc/Makefile.am 2012-12-09 17:51:03.000000000 +0200
6+++ bison-2.7/doc/Makefile.am 2013-01-02 06:49:50.804894071 +0200
7@@ -52,15 +52,11 @@
8 ## Man Pages. ##
9 ## ----------- ##
10
11-dist_man_MANS = $(srcdir)/bison.1
12-
13-EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
14-MAINTAINERCLEANFILES += $(dist_man_MANS)
15+EXTRA_DIST += bison.x common.x
16
17 # Depend on configure to get version number changes.
18 common_dep = $(top_srcdir)/configure $(srcdir)/common.x
19 srcsrcdir = $(top_srcdir)/bin
20-$(srcdir)/bison.1: $(common_dep) $(top_srcdir)/src/getargs.c
21
22 # Differences to ignore when comparing the man page (the date).
23 remove_time_stamp = \
24@@ -94,8 +90,6 @@
25 fi
26 $(AM_V_at)rm -f $@*.t
27
28-nodist_man_MANS = yacc.1
29-
30 ## ------------------------------ ##
31 ## Graphviz examples generation. ##
32 ## ------------------------------ ##
diff --git a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch b/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
deleted file mode 100644
index 8b683793eb..0000000000
--- a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3help2man is looking at the generated binary for help output. This does not work for cross compilations. So taking out the local PREPATH (../src) directory from path so that help2 man can find the native version of the bison in the native sysroot directory.
4
5Date: 2010/06/28
6Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
7
8diff --git a/doc/Makefile.am b/doc/Makefile.am
9index c7f2755..af9453a 100644
10--- a/doc/Makefile.am
11+++ b/doc/Makefile.am
12@@ -80,7 +80,6 @@ PREPATH = $(top_builddir)/src
13 echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program && \
14 (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit; \
15 done
16- $(AM_V_at)PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH"; \
17 export PATH; \
18 $(HELP2MAN) \
19 --include=$*.x \
diff --git a/meta/recipes-devtools/bison/bison_2.7.1.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb
index 025fc970f5..506141041c 100644
--- a/meta/recipes-devtools/bison/bison_2.7.1.bb
+++ b/meta/recipes-devtools/bison/bison_3.0.4.bb
@@ -9,29 +9,27 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
9SECTION = "devel" 9SECTION = "devel"
10DEPENDS = "bison-native flex-native" 10DEPENDS = "bison-native flex-native"
11 11
12BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ 12SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
13 file://m4.patch \ 13 file://m4.patch \
14 file://dont-depend-on-help2man.patch \ 14 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
15 " 15"
16 16
17# No point in hardcoding path to m4, just use PATH 17# No point in hardcoding path to m4, just use PATH
18EXTRA_OECONF += "M4=m4" 18EXTRA_OECONF += "M4=m4"
19 19
20SRC_URI = "${BASE_SRC_URI} \ 20SRC_URI[md5sum] = "c342201de104cc9ce0a21e0ad10d4021"
21 file://fix_cross_manpage_building.patch \ 21SRC_URI[sha256sum] = "a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1"
22 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
23 "
24
25SRC_URI[md5sum] = "7be02eb973eccf388f1ae750fc09eed0"
26SRC_URI[sha256sum] = "b409adcbf245baadb68d2f66accf6fdca5e282cafec1b865f4b5e963ba8ea7fb"
27 22
28LDFLAGS_prepend_libc-uclibc = " -lrt " 23LDFLAGS_prepend_libc-uclibc = " -lrt "
29DEPENDS_class-native = "gettext-minimal-native" 24DEPENDS_class-native = "gettext-minimal-native"
30SRC_URI_class-native = "${BASE_SRC_URI}"
31 25
32inherit autotools gettext texinfo 26inherit autotools gettext texinfo
33acpaths = "-I ${S}/m4" 27acpaths = "-I ${S}/m4"
34 28
29do_compile_prepend() {
30 for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done
31}
32
35do_install_append_class-native() { 33do_install_append_class-native() {
36 create_wrapper ${D}/${bindir}/bison \ 34 create_wrapper ${D}/${bindir}/bison \
37 BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison 35 BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison