Patchwork [18/19] xserver-xorg: Fix build determinism problem

login
register
mail settings
Submitter Richard Purdie
Date July 16, 2014, 4:26 p.m.
Message ID <742f62754f3a09352af1aa87c3072472f6e6549d.1405527926.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/75787/
State Accepted
Commit fe14f996bfbfd4555da9cbbfb0367be2a7e99b63
Headers show

Comments

Richard Purdie - July 16, 2014, 4:26 p.m.
We're seeing the warning:

WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps]

We list openssl in DEPENDS so we need to specify that as the sha1 provider
rather that nettle which is autodetected.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 +
 1 file changed, 1 insertion(+)
Ross Burton - July 16, 2014, 8:38 p.m.
On 16 July 2014 17:26, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps]
>
> We list openssl in DEPENDS so we need to specify that as the sha1 provider
> rather that nettle which is autodetected.

If xserver is seeing both openssl and nettle installed but picking
nettle, should we switch the build dependency from openssl to nettle?
The nettle library is half the size of openssl and has saner
licensing, so this seems like a win to me.

Ross
Richard Purdie - July 16, 2014, 9:47 p.m.
On Wed, 2014-07-16 at 21:38 +0100, Burton, Ross wrote:
> On 16 July 2014 17:26, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps]
> >
> > We list openssl in DEPENDS so we need to specify that as the sha1 provider
> > rather that nettle which is autodetected.
> 
> If xserver is seeing both openssl and nettle installed but picking
> nettle, should we switch the build dependency from openssl to nettle?
> The nettle library is half the size of openssl and has saner
> licensing, so this seems like a win to me.

Happy to have a follow up patch. I just fixed it so it was at least
doing what we were supposedly configuring it to.

Cheers,

Richard

Patch

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 628da58..dd60884 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -112,6 +112,7 @@  EXTRA_OECONF += "--with-fop=no \
                  --sysconfdir=/etc/X11 \
                  --localstatedir=/var \
                  --with-xkb-output=/var/lib/xkb \
+                 --with-sha1=libcrypto \
                  ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 "