From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org,
Robert Yang <liezhi.yang@windriver.com>
Cc: openembedded-commits@lists.openembedded.org
Subject: Re: [oe-commits] Robert Yang : bison: 2.7.1 -> 3.0.4
Date: Thu, 4 Jun 2015 11:54:22 +0200 [thread overview]
Message-ID: <20150604095422.GG2376@jama> (raw)
In-Reply-To: <20150421062058.65B1E5039B@opal.openembedded.org>
On Tue, Apr 21, 2015 at 06:20:58AM +0000, git@git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: fbb26d8db8e71fd979edd2bafa7e0bab7632950c
> URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fbb26d8db8e71fd979edd2bafa7e0bab7632950c
>
> Author: Robert Yang <liezhi.yang@windriver.com>
> Date: Tue Apr 14 02:07:12 2015 -0700
>
> 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
It seems to cause occasional hang in configure script when calling
javac, this is example from one world build:
|-python /home/jenkins/oe/world/shr-core/bitbake/bin/bitbake-worker decafbad
`-python /home/jenkins/oe/world/shr-core/bitbake/bin/bitbake-worker decafbad
`-run.do_configur /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/bison/3.0.4-r0/temp/run.do_configure.14060
`-bash /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/bison/3.0.4-r0/bison-3.0.4/configure --build=x86_64-linux --host=i586-oe-linux --target=i586-oe-linux --prefix=/usr --exec_prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --libexecdir=/usr/lib/bison --datadir=/usr/share --sysconfdir=/etc --sharedstatedir=/com --localstatedir=/var --libdir=/usr/lib --includedir=/usr/include --oldincludedir=/usr/include --infodir=/usr/share/info --mandir=/usr/share/man --disable-silent-rules --disable-dependency-tracking --with-libtool-sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86 M4=m4 --enable-nls
`-javac -version
`-9*[{javac}]
`-3*[{python}]
jenkins@aruba:~$ javac -version
javac 1.6.0_24
Killing that javac process unblocked it.
>
> 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>
>
> ---
>
> .../bison/bison/dont-depend-on-help2man.patch | 32 ----------------------
> .../bison/bison/fix_cross_manpage_building.patch | 19 -------------
> .../bison/{bison_2.7.1.bb => bison_3.0.4.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 21b44bf..0000000
> --- 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 8b68379..0000000
> --- 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
> similarity index 66%
> rename from meta/recipes-devtools/bison/bison_2.7.1.bb
> rename to meta/recipes-devtools/bison/bison_3.0.4.bb
> index 025fc97..5061410 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
>
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
parent reply other threads:[~2015-06-04 9:54 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20150421062058.65B1E5039B@opal.openembedded.org>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150604095422.GG2376@jama \
--to=martin.jansa@gmail.com \
--cc=liezhi.yang@windriver.com \
--cc=openembedded-commits@lists.openembedded.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.