[OE-core] [PATCH] flex: update to 2.6.4.

[Burton, Ross]

By passing --disable-bootstrap for the native build you're assuming that
the host has flex.  If we could assume that we wouldn't be building a
flex-native.

Also I submitted this upgrade a few months ago but flex was aborting in the
selftest, which is why it wasn't integrated.  I'll integrate it again, and
see what happens.

Ross

On 3 May 2018 at 10:09, Hong Liu <hongl.fnst at cn.fujitsu.com> wrote:

> From: Lei Maohui <leimaohui at cn.fujitsu.com>
>
> * Deleted 3 patches because these patches have been fixed in new version.
> * Added "--disable-bootstrap" to avoid the build error of stage1flex on
> host.
>
> stage1flex-misc.o: In function `allocate_array':
> misc.c:(.text+0x38f): undefined reference to `reallocarray'
> stage1flex-misc.o: In function `reallocate_array':
> misc.c:(.text+0xc8a): undefined reference to `reallocarray'
> collect2: error: ld returned 1 exit status
>
>
> Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
> Signed-off-by: Hong Liu <hongl.fnst at cn.fujitsu.com>
> ---
>  meta/recipes-devtools/flex/{flex_2.6.0.bb => flex_2.6.4.bb} | 13
> ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
>  rename meta/recipes-devtools/flex/{flex_2.6.0.bb => flex_2.6.4.bb} (84%)
>
> diff --git a/meta/recipes-devtools/flex/flex_2.6.0.bb
> b/meta/recipes-devtools/flex/flex_2.6.4.bb
> similarity index 84%
> rename from meta/recipes-devtools/flex/flex_2.6.0.bb
> rename to meta/recipes-devtools/flex/flex_2.6.4.bb
> index b89b751..4d59cc6 100644
> --- a/meta/recipes-devtools/flex/flex_2.6.0.bb
> +++ b/meta/recipes-devtools/flex/flex_2.6.4.bb
> @@ -10,17 +10,14 @@ BBCLASSEXTEND = "native nativesdk"
>
>  LIC_FILES_CHKSUM = "file://COPYING;md5=e4742cf92e89040b39486a6219b68067"
>
> -SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
> +SRC_URI = "https://github.com/westes/flex/releases/download/v2.6.4/
> flex-${PV}.tar.gz \
>             file://run-ptest \
> -           file://do_not_create_pdf_doc.patch \
>             file://0001-tests-add-a-target-for-building-tests-without-runnin.patch
> \
> -           file://0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
> \
> -           file://CVE-2016-6354.patch \
>             ${@bb.utils.contains('PTEST_ENABLED', '1', '',
> 'file://disable-tests.patch', d)} \
>             "
>
> -SRC_URI[md5sum] = "266270f13c48ed043d95648075084d59"
> -SRC_URI[sha256sum] = "24e611ef5a4703a191012f80c1027d
> c9d12555183ce0ecd46f3636e587e9b8e9"
> +SRC_URI[md5sum] = "2882e3179748cc9f9c23ec593d6adc8d"
> +SRC_URI[sha256sum] = "e87aae032bf07c26f85ac0ed325099
> 8c37621d95f8bd748b31f15b33c45ee995"
>
>  # Flex has moved to github from 2.6.1 onwards
>  UPSTREAM_CHECK_URI = "https://github.com/westes/flex/releases"
> @@ -30,7 +27,9 @@ inherit autotools gettext texinfo ptest
>
>  M4 = "${bindir}/m4"
>  M4_class-native = "${STAGING_BINDIR_NATIVE}/m4"
> -EXTRA_OECONF += "ac_cv_path_M4=${M4}"
> +EXTRA_OECONF += "ac_cv_path_M4=${M4} \
> +                 --disable-bootstrap \
> +                "
>  EXTRA_OEMAKE += "m4=${STAGING_BINDIR_NATIVE}/m4"
>
>  EXTRA_OEMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1',
> 'FLEX=${STAGING_BINDIR_NATIVE}/flex', '', d)}"
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180503/c7d4d234/attachment-0002.html>