diff options
Diffstat (limited to 'meta/recipes-devtools/bison')
| -rw-r--r-- | meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch | 19 | ||||
| -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 21b44bf79cd..00000000000 --- a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Inappropriate - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd bison-2.7/doc/Makefile.am bison-2.7/doc/Makefile.am ---- bison-2.7/doc/Makefile.am 2012-12-09 17:51:03.000000000 +0200 -+++ bison-2.7/doc/Makefile.am 2013-01-02 06:49:50.804894071 +0200 -@@ -52,15 +52,11 @@ - ## Man Pages. ## - ## ----------- ## - --dist_man_MANS = $(srcdir)/bison.1 -- --EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x --MAINTAINERCLEANFILES += $(dist_man_MANS) -+EXTRA_DIST += bison.x common.x - - # Depend on configure to get version number changes. - common_dep = $(top_srcdir)/configure $(srcdir)/common.x - srcsrcdir = $(top_srcdir)/bin --$(srcdir)/bison.1: $(common_dep) $(top_srcdir)/src/getargs.c - - # Differences to ignore when comparing the man page (the date). - remove_time_stamp = \ -@@ -94,8 +90,6 @@ - fi - $(AM_V_at)rm -f $@*.t - --nodist_man_MANS = yacc.1 -- - ## ------------------------------ ## - ## Graphviz examples generation. ## - ## ------------------------------ ## 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 8b683793ebc..00000000000 --- a/meta/recipes-devtools/bison/bison/fix_cross_manpage_building.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -help2man 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. - -Date: 2010/06/28 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index c7f2755..af9453a 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -80,7 +80,6 @@ PREPATH = $(top_builddir)/src - echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program && \ - (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit; \ - done -- $(AM_V_at)PATH="$(PREPATH)$(PATH_SEPARATOR)$$PATH"; \ - export PATH; \ - $(HELP2MAN) \ - --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 025fc970f52..506141041c4 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" SECTION = "devel" DEPENDS = "bison-native flex-native" -BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ - file://m4.patch \ - file://dont-depend-on-help2man.patch \ - " +SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ + file://m4.patch \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ +" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI = "${BASE_SRC_URI} \ - file://fix_cross_manpage_building.patch \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ - " - -SRC_URI[md5sum] = "7be02eb973eccf388f1ae750fc09eed0" -SRC_URI[sha256sum] = "b409adcbf245baadb68d2f66accf6fdca5e282cafec1b865f4b5e963ba8ea7fb" +SRC_URI[md5sum] = "c342201de104cc9ce0a21e0ad10d4021" +SRC_URI[sha256sum] = "a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1" LDFLAGS_prepend_libc-uclibc = " -lrt " DEPENDS_class-native = "gettext-minimal-native" -SRC_URI_class-native = "${BASE_SRC_URI}" inherit autotools gettext texinfo acpaths = "-I ${S}/m4" +do_compile_prepend() { + for i in mfcalc calc++ rpcalc; do mkdir -p ${B}/examples/$i; done +} + do_install_append_class-native() { create_wrapper ${D}/${bindir}/bison \ BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison |