From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- ...need_charset_alias-when-building-for-musl.patch | 33 ++++++++++++ .../0001-src-local.mk-fix-parallel-issue.patch | 34 +++++++++++++ .../bison/bison/add-with-bisonlocaledir.patch | 58 ++++++++++++++++++++++ .../bison/dont-depend-on-help2man.patch.patch | 46 +++++++++++++++++ poky/meta/recipes-devtools/bison/bison_3.0.4.bb | 38 ++++++++++++++ 5 files changed, 209 insertions(+) create mode 100644 poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch create mode 100644 poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch create mode 100644 poky/meta/recipes-devtools/bison/bison/add-with-bisonlocaledir.patch create mode 100644 poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch create mode 100644 poky/meta/recipes-devtools/bison/bison_3.0.4.bb (limited to 'poky/meta/recipes-devtools/bison') diff --git a/poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..ba1a4bab4c --- /dev/null +++ b/poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch @@ -0,0 +1,33 @@ +From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 13 Apr 2015 17:02:13 -0700 +Subject: [PATCH] Unset need_charset_alias when building for musl + +localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 +which actually shoudl be fixed in gnulib and then all downstream +projects will get it eventually. For now we apply the fix to +coreutils + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + lib/gnulib.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/gnulib.mk b/lib/gnulib.mk +index e1d74db..c0e92dd 100644 +--- a/lib/gnulib.mk ++++ b/lib/gnulib.mk +@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +-- +2.1.4 + diff --git a/poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch b/poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch new file mode 100644 index 0000000000..1e86f55220 --- /dev/null +++ b/poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch @@ -0,0 +1,34 @@ +From 5b9204eee4b06b48d54ecc3ef3a0b56fc5cc84f8 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Fri, 24 Apr 2015 00:38:32 -0700 +Subject: [PATCH] src/local.mk: fix parallel issue + +Fixed: +rm -f src/yacc src/yacc.tmp +echo '#! /bin/sh' >src/yacc.tmp +/bin/bash: src/yacc.tmp: No such file or directory +Makefile:6670: recipe for target 'src/yacc' failed + +Upstream-Status: Submitted [ http://lists.gnu.org/archive/html/bison-patches/2017-07/msg00000.html ] + +Signed-off-by: Robert Yang +Signed-off-by: Dengke Du +--- + src/local.mk | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/local.mk b/src/local.mk +index 573ad00..28bfae4 100644 +--- a/src/local.mk ++++ b/src/local.mk +@@ -119,6 +119,7 @@ MOSTLYCLEANFILES += src/yacc + + src/yacc: + $(AM_V_GEN)rm -f $@ $@.tmp ++ $(AM_V_at)$(MKDIR_P) src + $(AM_V_at)echo '#! /bin/sh' >$@.tmp + $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp + $(AM_V_at)chmod a+x $@.tmp +-- +2.8.1 + diff --git a/poky/meta/recipes-devtools/bison/bison/add-with-bisonlocaledir.patch b/poky/meta/recipes-devtools/bison/bison/add-with-bisonlocaledir.patch new file mode 100644 index 0000000000..35c0f6fa37 --- /dev/null +++ b/poky/meta/recipes-devtools/bison/bison/add-with-bisonlocaledir.patch @@ -0,0 +1,58 @@ +From 41fdca818cdc7bd686c31aff4088b89280d71a42 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 17 Feb 2016 22:01:28 -0500 +Subject: [PATCH] m4/bison-i18n.m4: add --with-bisonlocaledir to assign + BISON_LOCALEDIR + +The variable BISON_LOCALEDIR is assigned only by the output of +'bison --print-localedir', we add option --with-bisonlocaledir +to assign it explicitly. It is helpful for user to split the +native compile and cross compile. + +For backward compatibility, if option not used, it still +make use of the output of 'bison --print-localedir'. + +Upstream-Status: Submitted [bison-patches@gnu.org] + +Signed-off-by: Hongxu Jia +--- + m4/bison-i18n.m4 | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/m4/bison-i18n.m4 b/m4/bison-i18n.m4 +index 8e57caf..c36f498 100644 +--- a/m4/bison-i18n.m4 ++++ b/m4/bison-i18n.m4 +@@ -16,11 +16,16 @@ dnl sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files + dnl and defines YYENABLE_NLS if there are bison-runtime.mo files at all. + AC_DEFUN([BISON_I18N], + [ ++ dnl Default is not to set bisonlocaledir ++ AC_ARG_WITH([bisonlocaledir], ++ [ --with-bisonlocaledir sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files], ++ BISON_LOCALEDIR=$withval, ++ BISON_LOCALEDIR=) ++ + if test -z "$USE_NLS"; then + echo "The BISON-I18N macro is used without being preceded by AM-GNU-GETTEXT." 1>&2 + exit 1 + fi +- BISON_LOCALEDIR= + BISON_USE_NLS=no + if test "$USE_NLS" = yes; then + dnl Determine bison's localedir. +@@ -28,9 +33,10 @@ AC_DEFUN([BISON_I18N], + dnl But even is YACC is called "yacc", it may be a script that invokes bison + dnl and accepts the --print-localedir option. + dnl YACC's default value is empty; BISON's default value is :. +- if (${YACC-${BISON-:}} --print-localedir) >/dev/null 2>&1; then ++ if test -z "$BISON_LOCALEDIR" -a ${YACC-${BISON-:}} --print-localedir >/dev/null 2>&1; then + BISON_LOCALEDIR=`${YACC-${BISON-:}} --print-localedir` + fi ++ AC_MSG_RESULT([$BISON_LOCALEDIR]) + AC_SUBST([BISON_LOCALEDIR]) + if test -n "$BISON_LOCALEDIR"; then + dnl There is no need to enable internationalization if the user doesn't +-- +1.9.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 new file mode 100644 index 0000000000..ac16c5770a --- /dev/null +++ b/poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch @@ -0,0 +1,46 @@ +From 4c0d7733f30903f8d7c7cd7433f5c8a7505e35f5 Mon Sep 17 00:00:00 2001 +From: Marko Lindqvist +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 + +Updated for bison 3.0.4 + +Signed-off-by: Robert Yang +--- + doc/local.mk | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/doc/local.mk b/doc/local.mk +index c340452..642f385 100644 +--- a/doc/local.mk ++++ b/doc/local.mk +@@ -98,10 +98,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 = \ +@@ -124,10 +121,6 @@ $(top_srcdir)/doc/bison.1: $(MAN_DEPS) + fi + $(AM_V_at)rm -f $@*.t + +-if ENABLE_YACC +-nodist_man_MANS = doc/yacc.1 +-endif +- + ## ----------------------------- ## + ## Graphviz examples generation. ## + ## ----------------------------- ## +-- +1.7.9.5 + diff --git a/poky/meta/recipes-devtools/bison/bison_3.0.4.bb b/poky/meta/recipes-devtools/bison/bison_3.0.4.bb new file mode 100644 index 0000000000..58728f5021 --- /dev/null +++ b/poky/meta/recipes-devtools/bison/bison_3.0.4.bb @@ -0,0 +1,38 @@ +SUMMARY = "GNU Project parser generator (yacc replacement)" +DESCRIPTION = "Bison is a general-purpose parser generator that converts an annotated context-free grammar into \ +an LALR(1) or GLR parser for that grammar. Bison is upward compatible with Yacc: all properly-written Yacc \ +grammars ought to work with Bison with no change. Anyone familiar with Yacc should be able to use Bison with \ +little trouble." +HOMEPAGE = "http://www.gnu.org/software/bison/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "devel" +DEPENDS = "bison-native flex-native" + +SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://dont-depend-on-help2man.patch.patch \ + file://0001-src-local.mk-fix-parallel-issue.patch \ + file://add-with-bisonlocaledir.patch \ +" + +# No point in hardcoding path to m4, just use PATH +EXTRA_OECONF += "M4=m4" + +SRC_URI[md5sum] = "c342201de104cc9ce0a21e0ad10d4021" +SRC_URI[sha256sum] = "a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1" + +inherit autotools gettext texinfo + +# The automatic m4 path detection gets confused, so force the right value +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 +} +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3