[OE-core] [oe-commits] [openembedded-core] 02/45: fribidi: use Meson instead of autotools

Khem Raj raj.khem at gmail.com
Wed Sep 26 15:56:54 UTC 2018


Yes, it works.
On Tue, Sep 25, 2018 at 6:23 AM Burton, Ross <ross.burton at intel.com> wrote:
>
> Can you try again with poky-contrib:ross/meson?  Pulling that thread
> turned out to be more complex than expected...
>
> Ross
> On Mon, 24 Sep 2018 at 21:18, Khem Raj <raj.khem at gmail.com> wrote:
> >
> > Ross
> >
> > I am seeing some extra fails which could be related to your proposed changes
> >
> > http://errors.yoctoproject.org/Errors/Build/68805/
> >
> > see the first three
> > On Mon, Sep 24, 2018 at 12:28 PM Burton, Ross <ross.burton at intel.com> wrote:
> > >
> > > Turns out that fix promptly breaks something else...
> > >
> > > Digging into Meson today and trying to fix some target/host confusion.
> > >
> > > Ross
> > > On Mon, 24 Sep 2018 at 19:58, Khem Raj <raj.khem at gmail.com> wrote:
> > > >
> > > > On Mon, Sep 24, 2018 at 4:10 AM Burton, Ross <ross.burton at intel.com> wrote:
> > > > >
> > > > > I can't seem to replicate this on our centos7 box:
> > > > >
> > > > > [ross at centos7 build]$ gcc --version
> > > > > gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28)
> > > > > [ross at centos7 build]$ gcc -ffdjsj
> > > > > gcc: error: unrecognized command line option ‘-ffdjsj’
> > > > > gcc: fatal error: no input files
> > > > > compilation terminated.
> > > > > [ross at centos7 build]$ gcc -fstack-protector-strong
> > > > > gcc: fatal error: no input files
> > > > > compilation terminated.
> > > > >
> > > > > Presumably we've upgraded gcc at some point...
> > > > >
> > > > > However I did replicate the same sort of problem outside of OE.  Can
> > > > > one of you test
> > > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=ross/mut&id=1e32317ad77457d2a026eaa67ea7c6eebe58b127
> > > > > for me please?
> > > > >
> > > >
> > > > this solves the issue, thanks for prompt turnaround for fixing it
> > > >
> > > > > Cheers,
> > > > > Ross
> > > > > On Mon, 24 Sep 2018 at 11:08, Burton, Ross <ross.burton at intel.com> wrote:
> > > > > >
> > > > > > Looks like Meson is using the target link flags for linking even when
> > > > > > it knows its doing a native build.  Talking to Meson upstream now and
> > > > > > have a workaround.
> > > > > >
> > > > > > Ross
> > > > > > On Sun, 23 Sep 2018 at 15:51, Khem Raj <raj.khem at gmail.com> wrote:
> > > > > > >
> > > > > > > On Sun, Sep 23, 2018 at 2:20 AM Martin Jansa <martin.jansa at gmail.com> wrote:
> > > > > > > >
> > > > > > > > Was this one ever sent to ML? I haven't found it in the archives.
> > > > > > > >
> > > > > > > > With security flags enabled it fails on older hosts (e.g. Ubuntu 14.04 with gcc-4.8) now with:
> > > > > > >
> > > > > > > I am seeing same failure on ubuntu 14.04 and centos7 boxes
> > > > > > > this definitely is regression, its being not to right about using
> > > > > > > TARGET_CFLAGS where it should not be using them
> > > > > > >
> > > > > > > >
> > > > > > > > DEBUG: Executing shell function do_compile
> > > > > > > > [1/63] gcc -Igen.tab/gen.tab@@gen-unicode-version at exe -Igen.tab -I../fribidi-1.0.5/gen.tab -I. -I../fribidi-1.0.5/ -Ilib -I../fribidi-1.0.5/lib -pipe -D_FILE_OFFSET_BITS=64 -ansi -fvisibility=hidden -O2 -g -feliminate-unused-debug-types -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0=/usr/src/debug/fribidi/1.0.5-r0 -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0/recipe-sysroot-native= -UHAVE_CONFIG_H -DHAVE_STRINGIZE -DDONT_HAVE_FRIBIDI_CONFIG_H -DHAVE_STDLIB_H -DHAVE_STRING_H -DHAVE_STRINGS_H -DSTDC_HEADERS=1  -MD -MQ 'gen.tab/gen.tab@@gen-unicode-version at exe/gen-unicode-version.c.o' -MF 'gen.tab/gen.tab@@gen-unicode-version at exe/gen-unicode-version.c.o.d' -o 'gen.tab/gen.tab@@gen-unicode-version at exe/gen-unicode-version.c.o' -c ../fribidi-1.0.5/gen.tab/gen-unicode-version.c
> > > > > > > > [2/63] gcc   -o gen.tab/gen-unicode-version 'gen.tab/gen.tab@@gen-unicode-version at exe/gen-unicode-version.c.o' -Wl,--no-undefined -Wl,--as-needed -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0=/usr/src/debug/fribidi/1.0.5-r0 -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0/recipe-sysroot-native= -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong -Wl,-z,relro,-z,now
> > > > > > > > FAILED: gen.tab/gen-unicode-version
> > > > > > > > gcc   -o gen.tab/gen-unicode-version 'gen.tab/gen.tab@@gen-unicode-version at exe/gen-unicode-version.c.o' -Wl,--no-undefined -Wl,--as-needed -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0=/usr/src/debug/fribidi/1.0.5-r0 -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0/recipe-sysroot= -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi3-webos-linux-gnueabi/fribidi/1.0.5-r0/recipe-sysroot-native= -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong -Wl,-z,relro,-z,now
> > > > > > > > gcc: error: unrecognized command line option ‘-fstack-protector-strong’
> > > > > > > > ninja: build stopped: subcommand failed.
> > > > > > > > WARNING: exit code 1 from a shell command.
> > > > > > > >
> > > > > > > > Is meson too active in adding SECURITY_FLAGS even to native part of the build or should we just just remove -fstack-protector-strong completely for fribidi?
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > On Fri, Sep 21, 2018 at 5:24 PM <git at git.openembedded.org> wrote:
> > > > > > > >>
> > > > > > > >> This is an automated email from the git hooks/post-receive script.
> > > > > > > >>
> > > > > > > >> rpurdie pushed a commit to branch master-next
> > > > > > > >> in repository openembedded-core.
> > > > > > > >>
> > > > > > > >> commit d297f7ebf3f62528d055e1938a9693d6f3a61935
> > > > > > > >> Author: Ross Burton <ross.burton at intel.com>
> > > > > > > >> AuthorDate: Fri Sep 14 00:28:39 2018 +0100
> > > > > > > >>
> > > > > > > >>     fribidi: use Meson instead of autotools
> > > > > > > >>
> > > > > > > >>     Upstream is moving to Meson, so backport a patch to use that instead of
> > > > > > > >>     autotools.
> > > > > > > >>
> > > > > > > >>     Signed-off-by: Ross Burton <ross.burton at intel.com>
> > > > > > > >> ---
> > > > > > > >>  meta/recipes-support/fribidi/fribidi/meson.patch | 44 ++++++++++++++++++++++++
> > > > > > > >>  meta/recipes-support/fribidi/fribidi_1.0.5.bb    |  8 ++---
> > > > > > > >>  2 files changed, 47 insertions(+), 5 deletions(-)
> > > > > > > >>
> > > > > > > >> diff --git a/meta/recipes-support/fribidi/fribidi/meson.patch b/meta/recipes-support/fribidi/fribidi/meson.patch
> > > > > > > >> new file mode 100644
> > > > > > > >> index 0000000..8b3c4a9
> > > > > > > >> --- /dev/null
> > > > > > > >> +++ b/meta/recipes-support/fribidi/fribidi/meson.patch
> > > > > > > >> @@ -0,0 +1,44 @@
> > > > > > > >> +Upstream-Status: Backport
> > > > > > > >> +Signed-off-by: Ross Burton <ross.burton at intel.com>
> > > > > > > >> +
> > > > > > > >> +From f5feb6c599adb52f24656f8589868039b0d14272 Mon Sep 17 00:00:00 2001
> > > > > > > >> +From: Heiko Becker <heirecka at exherbo.org>
> > > > > > > >> +Date: Fri, 7 Sep 2018 20:57:11 +0200
> > > > > > > >> +Subject: [PATCH] Build generator executables natively
> > > > > > > >> +
> > > > > > > >> +They are run during the build and not installed in the end. Without
> > > > > > > >> +this one gets the following error from meson: "ERROR: Can not use
> > > > > > > >> +target gen-unicode-version as a generator because it is cross-built
> > > > > > > >> +and no exe wrapper is defined. You might want to set it to native
> > > > > > > >> +instead."
> > > > > > > >> +
> > > > > > > >> +Closes #87.
> > > > > > > >> +
> > > > > > > >> +---
> > > > > > > >> + gen.tab/meson.build | 6 ++++--
> > > > > > > >> + 1 file changed, 4 insertions(+), 2 deletions(-)
> > > > > > > >> +
> > > > > > > >> +diff --git a/gen.tab/meson.build b/gen.tab/meson.build
> > > > > > > >> +index 6006d98..8c21e98 100644
> > > > > > > >> +--- a/gen.tab/meson.build
> > > > > > > >> ++++ b/gen.tab/meson.build
> > > > > > > >> +@@ -33,7 +33,8 @@ gen_unicode_version = executable('gen-unicode-version',
> > > > > > > >> +   'gen-unicode-version.c',
> > > > > > > >> +   include_directories: incs,
> > > > > > > >> +   c_args: native_args,
> > > > > > > >> +-  install: false)
> > > > > > > >> ++  install: false,
> > > > > > > >> ++  native: true)
> > > > > > > >> +
> > > > > > > >> + fribidi_unicode_version_h = custom_target('fribidi-unicode-version.h',
> > > > > > > >> +   input: files('unidata/ReadMe.txt', 'unidata/BidiMirroring.txt'),
> > > > > > > >> +@@ -67,7 +68,8 @@ foreach tab : tabs
> > > > > > > >> +     gen_prog_src, 'packtab.c',
> > > > > > > >> +     include_directories: incs,
> > > > > > > >> +     c_args: native_args,
> > > > > > > >> +-    install: false)
> > > > > > > >> ++    install: false,
> > > > > > > >> ++    native: true)
> > > > > > > >> +
> > > > > > > >> +   tab_inc_file = custom_target(gen_prog_name,
> > > > > > > >> +     input: gen_prog_inputs,
> > > > > > > >> diff --git a/meta/recipes-support/fribidi/fribidi_1.0.5.bb b/meta/recipes-support/fribidi/fribidi_1.0.5.bb
> > > > > > > >> index 303ccb7..63b2da6 100644
> > > > > > > >> --- a/meta/recipes-support/fribidi/fribidi_1.0.5.bb
> > > > > > > >> +++ b/meta/recipes-support/fribidi/fribidi_1.0.5.bb
> > > > > > > >> @@ -3,16 +3,14 @@ SECTION = "libs"
> > > > > > > >>  LICENSE = "LGPLv2.1+"
> > > > > > > >>  LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
> > > > > > > >>
> > > > > > > >> -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2"
> > > > > > > >> +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
> > > > > > > >> +           file://meson.patch"
> > > > > > > >>  SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b"
> > > > > > > >>  SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce"
> > > > > > > >>
> > > > > > > >>  UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
> > > > > > > >>
> > > > > > > >> -inherit autotools lib_package pkgconfig
> > > > > > > >> -
> > > > > > > >> -# TODO use Meson instead of autotools when
> > > > > > > >> -# https://github.com/fribidi/fribidi/issues/87 is solved
> > > > > > > >> +inherit meson lib_package pkgconfig
> > > > > > > >>
> > > > > > > >>  CVE_PRODUCT = "gnu_fribidi"
> > > > > > > >>
> > > > > > > >>
> > > > > > > >> --
> > > > > > > >> To stop receiving notification emails like this one, please contact
> > > > > > > >> the administrator of this repository.
> > > > > > > >> --
> > > > > > > >> _______________________________________________
> > > > > > > >> Openembedded-commits mailing list
> > > > > > > >> Openembedded-commits at lists.openembedded.org
> > > > > > > >> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
> > > > > > > >
> > > > > > > > --
> > > > > > > > _______________________________________________
> > > > > > > > Openembedded-core mailing list
> > > > > > > > Openembedded-core at lists.openembedded.org
> > > > > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core



More information about the Openembedded-core mailing list