[PATCH 0/6] meta: 6 fixes

[PATCH 0/6] meta: 6 fixes

[Robert Yang]

The following changes since commit 8d207e55031c0b93387e728f4312b8cb34ad5b12:

  libgpg-error 1.18: simplify tupple handling and add armv8b support (2015-04-13 22:32:06 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/6fixes
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/6fixes

Robert Yang (6):
  libxml2: fix python path and add libxml2-python
  cracklib: add python support back
  libepoxy: DEPENDS on virtual/mesa
  strace: fix build for aarch64
  aspell: inherit binconfig-disabled
  libunwind: fix build with aarch64

 meta/recipes-core/libxml/libxml2.inc               |   19 ++++++-----
 .../strace/sigreturn.c-fix-build-for-aarch64.patch |   34 ++++++++++++++++++++
 meta/recipes-devtools/strace/strace_4.10.bb        |    1 +
 meta/recipes-extended/cracklib/cracklib_2.9.2.bb   |   28 +++++++++++++---
 meta/recipes-graphics/libepoxy/libepoxy_1.2.bb     |    2 +-
 meta/recipes-support/aspell/aspell_0.60.6.1.bb     |    4 ++-
 meta/recipes-support/libunwind/libunwind.inc       |    2 ++
 7 files changed, 74 insertions(+), 16 deletions(-)
 create mode 100644 meta/recipes-devtools/strace/strace/sigreturn.c-fix-build-for-aarch64.patch

-- 
1.7.9.5

[PATCH 1/6] libxml2: fix python path and add libxml2-python

[Robert Yang]

We have libxml2-python for native and nativesdk, but don't have it for
target, and can't find the reason from the git log, libxml2-python is
widely used, after looked into it's configure.in, we can add it
by PACKAGECONFIG.

The previous --with-python=${STAGING_BINDIR}/python is incorrect, it
acted as work becase it's conigure can check automatically, python is in
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}, as known as
${PYTHON}.

Add python to PACKAGECONFIG, since createrepo rdepends on
libxml2-python, otherwise the target createrepo can't work.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/libxml/libxml2.inc |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 1314bbf..1c62254 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
                     file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \
                     file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e"
 
-DEPENDS_class-nativesdk = "nativesdk-python"
-DEPENDS_class-native = "python-native"
 DEPENDS =+ "zlib"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
@@ -37,16 +35,17 @@ do_configure_prepend () {
 	sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.ac
 }
 
-do_configure_prepend_class-nativesdk () {
-	# Ensure we get the correct site-packages path
-	export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
-}
+export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
+
+PACKAGECONFIG ??= "python"
+PACKAGECONFIG_linuxstdbase ??= ""
 
+PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python,python-core"
 # WARNING: zlib is require for RPM use
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
-EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --without-docbook --with-c14n --without-lzma --with-zlib"
-EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --without-docbook --with-c14n --without-lzma --with-zlib"
-EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib"
+EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
+EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib"
+EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib"
+EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib"
 
 # required for pythong binding
 export HOST_SYS
-- 
1.7.9.5

Re: [PATCH 1/6] libxml2: fix python path and add libxml2-python

[Richard Purdie]

On Tue, 2015-04-14 at 02:08 -0700, Robert Yang wrote:
> We have libxml2-python for native and nativesdk, but don't have it for
> target, and can't find the reason from the git log, libxml2-python is
> widely used, after looked into it's configure.in, we can add it
> by PACKAGECONFIG.
> 
> The previous --with-python=${STAGING_BINDIR}/python is incorrect, it
> acted as work becase it's conigure can check automatically, python is in
> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}, as known as
> ${PYTHON}.
> 
> Add python to PACKAGECONFIG, since createrepo rdepends on
> libxml2-python, otherwise the target createrepo can't work.
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

Something here caused a load of failures:

http://errors.yoctoproject.org/Errors/Search/?items=10&query=90b8d406488b0a3c42b2a745526e5b1273d8a982

e.g. specifically http://errors.yoctoproject.org/Errors/Details/9808/

Cheers,

Richard

Re: [PATCH 1/6] libxml2: fix python path and add libxml2-python

[Robert Yang]

On 04/16/2015 04:38 AM, Richard Purdie wrote:
> On Tue, 2015-04-14 at 02:08 -0700, Robert Yang wrote:
>> We have libxml2-python for native and nativesdk, but don't have it for
>> target, and can't find the reason from the git log, libxml2-python is
>> widely used, after looked into it's configure.in, we can add it
>> by PACKAGECONFIG.
>>
>> The previous --with-python=${STAGING_BINDIR}/python is incorrect, it
>> acted as work becase it's conigure can check automatically, python is in
>> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}, as known as
>> ${PYTHON}.
>>
>> Add python to PACKAGECONFIG, since createrepo rdepends on
>> libxml2-python, otherwise the target createrepo can't work.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>
> Something here caused a load of failures:
>
> http://errors.yoctoproject.org/Errors/Search/?items=10&query=90b8d406488b0a3c42b2a745526e5b1273d8a982
>
> e.g. specifically http://errors.yoctoproject.org/Errors/Details/9808/

Sorry, I updated it in the repo:

   git://git.openembedded.org/openembedded-core-contrib rbt/6fixes

It was because of this line:
PACKAGECONFIG_linuxstdbase ??= ""

We need remove it to use:
PACKAGECONFIG ??= "python"

// Robert

>
> Cheers,
>
> Richard
>
>
>

[PATCH 2/6] cracklib: add python support back

[Robert Yang]

It had been disabled because of installed-vs-shipped:
    WARNING:   /usr/lib/python2.7
    WARNING:   /usr/lib/python2.7/site-packages

Now we fix it and add cracklib-python back.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/cracklib/cracklib_2.9.2.bb |   28 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.2.bb b/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
index 177ab27..fceca54 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
@@ -4,10 +4,12 @@ HOMEPAGE = "http://sourceforge.net/projects/cracklib"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
-DEPENDS = "cracklib-native zlib"
-DEPENDS_class-native = "zlib-native"
+DEPENDS = "cracklib-native zlib python"
+RDEPEND_${PN}-python += "python"
 
-EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
+PACKAGES += "${PN}-python"
+
+EXTRA_OECONF = "--with-python --libdir=${base_libdir}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \
            file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \
@@ -18,10 +20,28 @@ SRC_URI[sha256sum] = "c1c899291d443e99d1aecfbc879e4ac9c0cbc265574f47b487842da11e
 
 PR = "r1"
 
-inherit autotools gettext
+inherit autotools gettext pythonnative python-dir
 
 do_install_append_class-target() {
 	create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small
 }
 
+do_install_append() {
+	src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages"
+	rm -f $src_dir/*.pyo
+	rm -f $src_dir/test_cracklib.py
+	# Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir}
+	install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/
+	mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR}
+	rm -fr ${D}${base_libdir}/${PYTHON_DIR}
+}
+
 BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py \
+	${PYTHON_SITEPACKAGES_DIR}/_cracklib.so \
+    "
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/_cracklib.so"
+FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a \
+	${PYTHON_SITEPACKAGES_DIR}/_cracklib.la \
+    "
-- 
1.7.9.5

[PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Robert Yang]

Fixed do_configure error:
configure: error: libX11 headers (libx11-dev) required to build with GLX support
and do_compile error:
../include/epoxy/egl_generated.h:10:29: fatal error: EGL/eglplatform.h: No such file or directory
 #include "EGL/eglplatform.h"

The dependencies form its README.md:
* automake
* libegl1-mesa-dev
* xutils-dev

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-graphics/libepoxy/libepoxy_1.2.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
index 4357331..50b9d2c 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
@@ -13,4 +13,4 @@ S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-DEPENDS = "util-macros"
+DEPENDS = "util-macros virtual/mesa"
-- 
1.7.9.5

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Andreas Müller]

On Tue, Apr 14, 2015 at 11:09 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
> Fixed do_configure error:
> configure: error: libX11 headers (libx11-dev) required to build with GLX support
> and do_compile error:
> ../include/epoxy/egl_generated.h:10:29: fatal error: EGL/eglplatform.h: No such file or directory
>  #include "EGL/eglplatform.h"
>
> The dependencies form its README.md:
> * automake
> * libegl1-mesa-dev
> * xutils-dev
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  meta/recipes-graphics/libepoxy/libepoxy_1.2.bb |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
> index 4357331..50b9d2c 100644
> --- a/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
> +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
> @@ -13,4 +13,4 @@ S = "${WORKDIR}/git"
>
>  inherit autotools pkgconfig
>
> -DEPENDS = "util-macros"
> +DEPENDS = "util-macros virtual/mesa"
> --
> 1.7.9.5
>
from the error I would DEPEND on virtual/egl

Andreas

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

On 14 April 2015 at 14:50, Andreas Müller <schnitzeltony@googlemail.com>
wrote:

> from the error I would DEPEND on virtual/egl
>

Agreed.  And there's no dependency on virtual/libx11 which the readme you
quote suggests there should be.  Presumably that dependency - if it's
actually required - can be made conditional on the x11 DISTRO_FEATURE?

Ross

[-- Attachment #2: Type: text/html, Size: 764 bytes --]

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Andreas Müller]

On Tue, Apr 14, 2015 at 3:52 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 14 April 2015 at 14:50, Andreas Müller <schnitzeltony@googlemail.com>
> wrote:
>>
>> from the error I would DEPEND on virtual/egl
>
>
> Agreed.  And there's no dependency on virtual/libx11 which the readme you
> quote suggests there should be.  Presumably that dependency - if it's
> actually required - can be made conditional on the x11 DISTRO_FEATURE?
>
> Ross
>
1. To look for dependencies configure.ac is first place - Readme is
often a place without love
2. In meta-qt5-extra I have libepoxy in for a while - kwin needs it
[1]. Problem with Xorg-Macros: These are build for x11 in distro
features only but there are BSPs around (e.g meta-fsl-arm) supporting
either x11 or wayland - not both together. So for a wayland only
distro epoxy would not build.

[1] https://github.com/schnitzeltony/meta-qt5-extra/tree/master/recipes-support/libepoxy

Andreas

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

On 14 April 2015 at 15:03, Andreas Müller <schnitzeltony@googlemail.com>
wrote:

> 2. In meta-qt5-extra I have libepoxy in for a while - kwin needs it
> [1]. Problem with Xorg-Macros: These are build for x11 in distro
> features only but there are BSPs around (e.g meta-fsl-arm) supporting
> either x11 or wayland - not both together. So for a wayland only
> distro epoxy would not build.
>

util-macros doesn't require X11 to build.

Ross

[-- Attachment #2: Type: text/html, Size: 876 bytes --]

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Andreas Müller]

On Tue, Apr 14, 2015 at 4:06 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 14 April 2015 at 15:03, Andreas Müller <schnitzeltony@googlemail.com>
> wrote:
>>
>> 2. In meta-qt5-extra I have libepoxy in for a while - kwin needs it
>> [1]. Problem with Xorg-Macros: These are build for x11 in distro
>> features only but there are BSPs around (e.g meta-fsl-arm) supporting
>> either x11 or wayland - not both together. So for a wayland only
>> distro epoxy would not build.
>
>
> util-macros doesn't require X11 to build.
>
Right - just tested for wayland-only distro. Forget my last email.

Andreas

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Robert Yang]

On 04/14/2015 09:52 PM, Burton, Ross wrote:
>
> On 14 April 2015 at 14:50, Andreas Müller <schnitzeltony@googlemail.com
> <mailto:schnitzeltony@googlemail.com>> wrote:
>
>     from the error I would DEPEND on virtual/egl
>
>
> Agreed.  And there's no dependency on virtual/libx11 which the readme you quote

virtual/mesa or virtual/egl depends on virtual/libx11, so I didn't add
virtual/libx11, I updated virtual/mesa -> virtual/egl in the repo.

I also updated:

[OE-core] [PATCH 4/6] strace: fix build for aarch64

extern uint32_t *const arm_sp_ptr;

should be:
extern long *const arm_sp_ptr;

Otherwise there is a conflict types error when build arm.

// Robert

> suggests there should be.  Presumably that dependency - if it's actually
> required - can be made conditional on the x11 DISTRO_FEATURE?
>
> Ross

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Jussi Kukkonen]

On 15 April 2015 at 04:44, Robert Yang <liezhi.yang@windriver.com> wrote:
> On 04/14/2015 09:52 PM, Burton, Ross wrote:
>> On 14 April 2015 at 14:50, Andreas Müller <schnitzeltony@googlemail.com
>> <mailto:schnitzeltony@googlemail.com>> wrote:
>>
>>     from the error I would DEPEND on virtual/egl
>>
>> Agreed.  And there's no dependency on virtual/libx11 which the readme you
>> quote
>
> virtual/mesa or virtual/egl depends on virtual/libx11, so I didn't add
> virtual/libx11, I updated virtual/mesa -> virtual/egl in the repo.

That looks correct to me, thanks for fixing.

As a learning exercise, what would have been the correct (and least
destructive) way for me to test that I hadn't forgotten a dependency
like this? I assume the problem is that I already had the correct
headers and pkg-config files in the staging sysroot?

Jussi

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 722 bytes --]

On 15 April 2015 at 09:28, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:

> As a learning exercise, what would have been the correct (and least
> destructive) way for me to test that I hadn't forgotten a dependency
> like this? I assume the problem is that I already had the correct
> headers and pkg-config files in the staging sysroot?
>

Something else for the manual.

Once you have a recipe that works, the shortcut is to run "wipe-sysroot"
which deletes all the sysroots (and the relevant stamps).  Then you can do
bitbake foo -ccleansstate ; bitbake foo to do another build.  If that works
and doesn't just fail outright, you can then use buildhistory-diff to
verify that nothing changed.

Ross

[-- Attachment #2: Type: text/html, Size: 1155 bytes --]

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

On 15 April 2015 at 02:44, Robert Yang <liezhi.yang@windriver.com> wrote:

> virtual/mesa or virtual/egl depends on virtual/libx11, so I didn't add
> virtual/libx11, I updated virtual/mesa -> virtual/egl in the repo.
>

That's not strictly true.  Mesa depends on libx11 if it's enabled, but EGL
doesn't.  This should be an explicit dependency, and we need to be able to
control X11 enabled/disabled as otherwise we've lost the ability to ship
GTK+ without X11.

Ross

[-- Attachment #2: Type: text/html, Size: 915 bytes --]

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Robert Yang]

On 04/15/2015 04:32 PM, Burton, Ross wrote:
>
> On 15 April 2015 at 02:44, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     virtual/mesa or virtual/egl depends on virtual/libx11, so I didn't add
>     virtual/libx11, I updated virtual/mesa -> virtual/egl in the repo.
>
>
> That's not strictly true.  Mesa depends on libx11 if it's enabled, but EGL
> doesn't.  This should be an explicit dependency, and we need to be able to
> control X11 enabled/disabled as otherwise we've lost the ability to ship GTK+
> without X11.

Thanks, updated in the repo:

-DEPENDS = "util-macros"
+DEPENDS = "util-macros virtual/egl virtual/libx11"


   git://git.openembedded.org/openembedded-core-contrib rbt/6fixes

// Robert

>
> Ross

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

On 15 April 2015 at 10:30, Robert Yang <liezhi.yang@windriver.com> wrote:

> +DEPENDS = "util-macros virtual/egl virtual/libx11"
>

This means we can't build GTK+ without X11 (eg core-image-weston with x11
removed from DISTRO_FEATURES), as gtk+3 will depend on libepoxy which will
depend on libx11 which will refuse to build as x11 isn't in DISTRO_FEATURES.

libepoxy does conditional checks so the libx11 dependency can be condtional
on DISTRO_FEATURES.  That's no idea but better than nothing.

Ross

[-- Attachment #2: Type: text/html, Size: 1009 bytes --]

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Robert Yang]

On 04/15/2015 05:37 PM, Burton, Ross wrote:
>
> On 15 April 2015 at 10:30, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     +DEPENDS = "util-macros virtual/egl virtual/libx11"
>
>
> This means we can't build GTK+ without X11 (eg core-image-weston with x11
> removed from DISTRO_FEATURES), as gtk+3 will depend on libepoxy which will
> depend on libx11 which will refuse to build as x11 isn't in DISTRO_FEATURES.
>
> libepoxy does conditional checks so the libx11 dependency can be condtional on
> DISTRO_FEATURES.  That's no idea but better than nothing.

AFAIK, libx11 is a must for libepoxy when building on linux host.

I have to go to badminton now, talk to you later.

// Robert

>
> Ross

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

On 15 April 2015 at 11:21, Robert Yang <liezhi.yang@windriver.com> wrote:

> AFAIK, libx11 is a must for libepoxy when building on linux host.
>

Which is a problem, so we should fix it.  The code appears to be modular
enough, we just need to add an option to configure.ac so that GLX can be
disabled on Linux hosts.

Ross

[-- Attachment #2: Type: text/html, Size: 762 bytes --]

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Andreas Müller]

On Wed, Apr 15, 2015 at 11:37 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 15 April 2015 at 10:30, Robert Yang <liezhi.yang@windriver.com> wrote:
>>
>> +DEPENDS = "util-macros virtual/egl virtual/libx11"
>
>
> This means we can't build GTK+ without X11 (eg core-image-weston with x11
> removed from DISTRO_FEATURES), as gtk+3 will depend on libepoxy which will
> depend on libx11 which will refuse to build as x11 isn't in DISTRO_FEATURES.
>
> libepoxy does conditional checks so the libx11 dependency can be condtional
> on DISTRO_FEATURES.  That's no idea but better than nothing.
>
> Ross
After all these discussions I remmeber better what I went through
building libepoxy in meta-qt5-extra.
So my first suggestion is back - with the patches in meta-qt5-extra I
have managed to build libepoxy in x-less environments and without
depending on util-macros.

Patch [1]: util-macros no more required in DEPENDS
Patch [2]: allow build for x-less environments

I don't have time to prepare patches, but maybe somebody wants to take a look.

Ahh before I forget: libepoxy should inherit pythonnative - all source
file creation is done by pythonscripts.

Andreas

[1] https://github.com/schnitzeltony/meta-qt5-extra/blob/master/recipes-support/libepoxy/files/0001-configure.ac-don-t-rely-on-Xorg.macros.patch
[2] https://github.com/schnitzeltony/meta-qt5-extra/blob/master/recipes-support/libepoxy/files/0002-take-configuration-into-consideration-when-selecting.patch

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 895 bytes --]

On 15 April 2015 at 18:27, Andreas Müller <schnitzeltony@googlemail.com>
wrote:

> Patch [1]: util-macros no more required in DEPENDS
>

What's the point of this?  util-macros adds functionality and doesn't
depend on X in any way, it's just some m4 macros.


> Patch [2]: allow build for x-less environments
>

I'm glad this demonstrates that simply disabling GLX works but FWIW I
wouldn't accept this into oe-core as it's not deterministic.


> I don't have time to prepare patches, but maybe somebody wants to take a
> look.
>
> Ahh before I forget: libepoxy should inherit pythonnative - all source
> file creation is done by pythonscripts.
>

Isn't pythonnative only required if the Python needs to use modules that
were previously built natively?  Bitbake is Python so if it's just "run
this bit of basic python code" then the host Python is sufficient.

Ross

[-- Attachment #2: Type: text/html, Size: 1800 bytes --]

Re: [PATCH 3/6] libepoxy: DEPENDS on virtual/mesa

[Andreas Müller]

On Wed, Apr 15, 2015 at 9:08 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 15 April 2015 at 18:27, Andreas Müller <schnitzeltony@googlemail.com>
> wrote:
>>
>> Patch [1]: util-macros no more required in DEPENDS
>
>
> What's the point of this?  util-macros adds functionality and doesn't depend
> on X in any way, it's just some m4 macros.
reduces DEPENDENCIES slightly - but is not mandatory. I have added it
because there is only a mac specific option the macros are used for.
>
>>
>> Patch [2]: allow build for x-less environments
>
>
> I'm glad this demonstrates that simply disabling GLX works but FWIW I
> wouldn't accept this into oe-core as it's not deterministic.
I didn't do that for limited time and had no problem because I never
change DISTRO features for one builddir. To fix configure.ac needs an
additional configure option disabling xorg even if it was build.
>
>>
>> I don't have time to prepare patches, but maybe somebody wants to take a
>> look.
>>
>> Ahh before I forget: libepoxy should inherit pythonnative - all source
>> file creation is done by pythonscripts.
>
>
> Isn't pythonnative only required if the Python needs to use modules that
> were previously built natively?  Bitbake is Python so if it's just "run this
> bit of basic python code" then the host Python is sufficient.
>
Might be but as far as I can remember - this was added due to
configure failures for builds from scratch - but it is long ago...

Andreas

[PATCH 4/6] strace: fix build for aarch64

[Robert Yang]

Fixed:
sigreturn.c: In function 'sys_sigreturn':
sigreturn.c:27:7: error: 'aarch64_sp_ptr' undeclared (first use in this function)
     (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO +
sigreturn.c:30:7: error: 'arm_sp_ptr' undeclared (first use in this function)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../strace/sigreturn.c-fix-build-for-aarch64.patch |   34 ++++++++++++++++++++
 meta/recipes-devtools/strace/strace_4.10.bb        |    1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta/recipes-devtools/strace/strace/sigreturn.c-fix-build-for-aarch64.patch

diff --git a/meta/recipes-devtools/strace/strace/sigreturn.c-fix-build-for-aarch64.patch b/meta/recipes-devtools/strace/strace/sigreturn.c-fix-build-for-aarch64.patch
new file mode 100644
index 0000000..ac2621b
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/sigreturn.c-fix-build-for-aarch64.patch
@@ -0,0 +1,34 @@
+From 1ef2d93924581ec8412ee9c163fbc92d039c1222 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 14 Apr 2015 03:15:04 +0000
+Subject: [PATCH] sigreturn.c: fix build for aarch64
+
+Fixed:
+sigreturn.c: In function 'sys_sigreturn':
+sigreturn.c:27:7: error: 'aarch64_sp_ptr' undeclared (first use in this function)
+     (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO +
+sigreturn.c:30:7: error: 'arm_sp_ptr' undeclared (first use in this function)
+
+Upstream-Status: Backport [scratch from strace: a3c483545a7fb3a075f885a01a3c58b2f84db8fa]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ sigreturn.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sigreturn.c b/sigreturn.c
+index 648bd0a..45c4675 100644
+--- a/sigreturn.c
++++ b/sigreturn.c
+@@ -12,6 +12,8 @@
+ #elif NSIG < 32
+ # error NSIG < 32
+ #endif
++extern uint64_t *const aarch64_sp_ptr;
++extern uint32_t *const arm_sp_ptr;
+ 
+ int
+ sys_sigreturn(struct tcb *tcp)
+-- 
+2.0.1
+
diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.10.bb
index 416c387..489e1f4 100644
--- a/meta/recipes-devtools/strace/strace_4.10.bb
+++ b/meta/recipes-devtools/strace/strace_4.10.bb
@@ -9,6 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
            file://strace-add-configure-options.patch \
            file://Makefile-ptest.patch \
            file://run-ptest \
+           file://sigreturn.c-fix-build-for-aarch64.patch \
           "
 
 SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912"
-- 
1.7.9.5

[PATCH 5/6] aspell: inherit binconfig-disabled

[Robert Yang]

There is a pspell-config.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/aspell/aspell_0.60.6.1.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
index f546721..7cf17d6 100644
--- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
@@ -25,4 +25,6 @@ FILES_libpspell = "${libdir}/libpspell.so.*"
 FILES_${PN}-dev += "${bindir}/pspell-config"
 
 ARM_INSTRUCTION_SET = "arm"
-inherit autotools-brokensep gettext texinfo
+inherit autotools-brokensep gettext texinfo binconfig-disabled
+
+BINCONFIG = "${bindir}/pspell-config"
-- 
1.7.9.5

[PATCH 6/6] libunwind: fix build with aarch64

[Robert Yang]

Referred to RP's fix for x86 and x86-64:
34d517a5626ce2465f776367349bd9e66bf8ed1f
libunwind: Build with gold to avoid build failures

Fixed:
aarch64-poky-linux/4.9.2/ld: copy reloc against protected `_Uaarch64_local_addr_space' is invalid
aarch64-poky-linux/4.9.2/ld: failed to set dynamic section sizes: Bad value
aarch64-poky-linux/4.9.2/ld: copy reloc against protected `_Uaarch64_local_addr_space' is invalid
aarch64-poky-linux/4.9.2/ld: failed to set dynamic section sizes: Bad value
| collect2: error: ld returned 1 exit status

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/libunwind/libunwind.inc |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc
index 74afba1..56905c2 100644
--- a/meta/recipes-support/libunwind/libunwind.inc
+++ b/meta/recipes-support/libunwind/libunwind.inc
@@ -26,6 +26,8 @@ LIBATOMICS ?= ""
 LDFLAGS_append_x86 = " -fuse-ld=gold"
 LDFLAGS_append_x86-64 = " -fuse-ld=gold"
 
+LDFLAGS_append_aarch64 = " -fuse-ld=gold"
+
 DEPENDS += "${DEPLIBATOMICS}"
 DEPLIBATOMICS_armv5 = "libatomics-ops"
 DEPLIBATOMICS_armv4 = "libatomics-ops"
-- 
1.7.9.5