From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B84BC433EF for ; Thu, 14 Oct 2021 23:33:03 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.2601.1634254382748555613 for ; Thu, 14 Oct 2021 16:33:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=TeqJk0CL; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: martin.jansa@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id gn3so392755pjb.0 for ; Thu, 14 Oct 2021 16:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=qfet5TmvdnJpzDuosoZjk9FuY6GvrhjdciLCvAKH71U=; b=TeqJk0CLmQSPmFz32sB0QlGjsUZnF35mPa2qw/m/uAGkg9rl30xRjLa4DeKz1I4RcQ x5AzyfMbqdnRx6ZGJcMHudJCVRhAA/76KFKZBQOsWvPDlXK7PhVMyZt9hDtBZqJi+6r2 r48juYZcf/qqK5E+uafA/kZPJkd7kLRF1wTVVYuUg4NeNTdu+K4y8eVh8IFPKSAMl1Ir BTbRtVgiWlULEgAPPiT2T+dzw+hWGZFcgSQKZOsib1/5ovo4CO5MrmUl2a4mqUWYhW1B DJh9VLPWhhw8t9+A/8UMofcoWDWS1bRX61dXHcj6ETBBz3UVNHql7xOtrMZkARB9mJvR valg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=qfet5TmvdnJpzDuosoZjk9FuY6GvrhjdciLCvAKH71U=; b=v4ksK137dyxpgWqfzlMDlJ2jNd9HaNiUDv+xyq6NkJBFSheSVFh8zMZ+Ul/i7ps/y3 3gtR2JIV9iquNCm7ioESiVoTR4/SE5xqP6Zetqn3hjfUbjY7Zlkj74xBE/rAC/NbgOAA Y7kfWaYNH7YWdkHjfEnrMq0FU6+O0qX71A6mPZ2JvZGlXFy9nQ0zL8sS+i0ewghCIo42 iRId/HMxwK50OgbMxZbNu56xlCbGHWaG1NiVztf2VfSMxUkQb+bbWloQjiScQHt87I/J MgwAWtjgIcB7oI1vysZyNXc2l+3cAm2wx35QRLWg/Odvu6IHi4tC+qTeqLxzV8ssysEe e/+A== X-Gm-Message-State: AOAM530rq/iodA0k86KZ8TOgSFHpW2OSJdS/E1Dhj7DRMOaXcgon4wRx 60p38nM3pi2a9Q2TunogdqUJaupymjEMDTJmrRo= X-Google-Smtp-Source: ABdhPJy0B0GKGfJkcIPta7wZIKztKcmpBIduJDVYI8tHk5L2q0heUCgxnCqqCG12fGQnReHDnnXMN8vcEOuZ7XqeqAw= X-Received: by 2002:a17:902:e746:b0:13f:398e:a0e2 with SMTP id p6-20020a170902e74600b0013f398ea0e2mr7655760plf.48.1634254382275; Thu, 14 Oct 2021 16:33:02 -0700 (PDT) MIME-Version: 1.0 References: <20211014224120.84927-1-marex@denx.de> In-Reply-To: <20211014224120.84927-1-marex@denx.de> From: Martin Jansa Date: Thu, 14 Oct 2021 23:32:50 +0200 Message-ID: Subject: Re: [oe] [meta-oe][PATCH] apitrace: Conditionally enable X11 support To: Marek Vasut Cc: openembedded-devel , Khem Raj Content-Type: multipart/alternative; boundary="000000000000ed9ed405ce587f7b" List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 14 Oct 2021 23:33:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/93313 --000000000000ed9ed405ce587f7b Content-Type: text/plain; charset="UTF-8" Why not use PACKAGECONFIG for this? It won't set the EXTRA_OECMAKE automatically, but will handle the depends correctly (and will be easy to switch of if someone with x1 and opengl in DISTRO_FEATURES still doesn't wan to have X11 enabled here for whatever reason). On Fri, Oct 15, 2021 at 12:41 AM Marek Vasut wrote: > In case DISTRO_FEATURES contain both x11 and opengl, enable X11 support > in apitrace, because all the requirements are satisfied. > > Signed-off-by: Marek Vasut > Cc: Khem Raj > --- > meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb > b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb > index 57ec1f8e0..f097f78a9 100644 > --- a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb > +++ b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb > @@ -13,12 +13,13 @@ SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git > \ > S = "${WORKDIR}/git" > > DEPENDS += "zlib libpng python3-native" > +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > 'libx11', '', d)} " > > inherit cmake > > EXTRA_OECMAKE += "\ > -DENABLE_GUI=OFF \ > - -DENABLE_X11=OFF \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > '-DENABLE_X11=ON', '-DENABLE_X11=OFF', d)} \ > -DENABLE_STATIC_LIBGCC=OFF \ > -DENABLE_STATIC_LIBSTDCXX=OFF \ > -DPython3_ROOT_DIR=/usr/bin/python3-native \ > -- > 2.33.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#93312): > https://lists.openembedded.org/g/openembedded-devel/message/93312 > Mute This Topic: https://lists.openembedded.org/mt/86326776/3617156 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > Martin.Jansa@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > > --000000000000ed9ed405ce587f7b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Why not use PACKAGECONFIG for this? It won't set the E= XTRA_OECMAKE automatically, but will handle the depends correctly (and will= be easy to switch of if someone with x1 and opengl in DISTRO_FEATURES stil= l doesn't wan to have X11 enabled here for whatever reason).

<= div class=3D"gmail_quote">
On Fri, Oct= 15, 2021 at 12:41 AM Marek Vasut <mare= x@denx.de> wrote:
In case DISTRO_FEATURES contain both x11 and opengl, enable X11 = support
in apitrace, because all the requirements are satisfied.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Khem Raj <ra= j.khem@gmail.com>
---
=C2=A0meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb | 3 ++-
=C2=A01 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb b/meta-oe= /recipes-devtools/apitrace/apitrace_10.0.bb
index 57ec1f8e0..f097f78a9 100644
--- a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb
+++ b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb
@@ -13,12 +13,13 @@ SRC_URI =3D "gitsm://github.com/= ${BPN}/${BPN}.git \
=C2=A0S =3D "${WORKDIR}/git"

=C2=A0DEPENDS +=3D "zlib libpng python3-native"
+DEPENDS +=3D " ${@bb.utils.contains('DISTRO_FEATURES', 'x= 11 opengl', 'libx11', '', d)} "

=C2=A0inherit cmake

=C2=A0EXTRA_OECMAKE +=3D "\
=C2=A0 =C2=A0 =C2=A0-DENABLE_GUI=3DOFF \
-=C2=A0 =C2=A0 -DENABLE_X11=3DOFF \
+=C2=A0 =C2=A0 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 ope= ngl', '-DENABLE_X11=3DON', '-DENABLE_X11=3DOFF', d)} \<= br> =C2=A0 =C2=A0 =C2=A0-DENABLE_STATIC_LIBGCC=3DOFF \
=C2=A0 =C2=A0 =C2=A0-DENABLE_STATIC_LIBSTDCXX=3DOFF \
=C2=A0 =C2=A0 =C2=A0-DPython3_ROOT_DIR=3D/usr/bin/python3-native \
--
2.33.0


-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-
Links: You receive all messages sent to this group.
View/Reply Online (#93312): https:/= /lists.openembedded.org/g/openembedded-devel/message/93312
Mute This Topic: https://lists.openembedded.org/mt= /86326776/3617156
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org= /g/openembedded-devel/unsub [Martin.Jansa@gmail.com]
-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-

--000000000000ed9ed405ce587f7b--