All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH/next 1/1] package/log4cplus: add optional qt5 dependency
@ 2019-03-03 10:12 Fabrice Fontaine
  2019-03-07 22:13 ` Thomas Petazzoni
  2019-03-25 16:19 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2019-03-03 10:12 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/log4cplus/log4cplus.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk
index 0bc4fc9aa6..b632066de1 100644
--- a/package/log4cplus/log4cplus.mk
+++ b/package/log4cplus/log4cplus.mk
@@ -11,6 +11,13 @@ LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool)
 LOG4CPLUS_LICENSE_FILES = LICENSE
 LOG4CPLUS_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_QT5),y)
+LOG4CPLUS_DEPENDENCIES += host-pkgconf qt5base
+LOG4CPLUS_CONF_OPTS += --with-qt5
+else
+LOG4CPLUS_CONF_OPTS += --without-qt5
+endif
+
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 LOG4CPLUS_CONF_ENV += LIBS='-latomic'
 endif
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH/next 1/1] package/log4cplus: add optional qt5 dependency
  2019-03-03 10:12 [Buildroot] [PATCH/next 1/1] package/log4cplus: add optional qt5 dependency Fabrice Fontaine
@ 2019-03-07 22:13 ` Thomas Petazzoni
  2019-03-25 16:19 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2019-03-07 22:13 UTC (permalink / raw)
  To: buildroot

Hello Fabrice,

On Sun,  3 Mar 2019 11:12:52 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/log4cplus/log4cplus.mk | 7 +++++++
>  1 file changed, 7 insertions(+)

Thanks, I've applied, with one minor change, see below.

> diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk
> index 0bc4fc9aa6..b632066de1 100644
> --- a/package/log4cplus/log4cplus.mk
> +++ b/package/log4cplus/log4cplus.mk
> @@ -11,6 +11,13 @@ LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool)
>  LOG4CPLUS_LICENSE_FILES = LICENSE
>  LOG4CPLUS_INSTALL_STAGING = YES
>  
> +ifeq ($(BR2_PACKAGE_QT5),y)

I've changed to use BR2_PACKAGE_QT5BASE here. Obviously, it's
functionally exactly the same, because BR2_PACKAGE_QT5 selects
BR2_PACKAGE_QT5BASE. However, because we add qt5base to the
DEPENDENCIES variable below, I found it more consistent to check for
this specific package being enabled.

> +LOG4CPLUS_DEPENDENCIES += host-pkgconf qt5base
> +LOG4CPLUS_CONF_OPTS += --with-qt5
> +else
> +LOG4CPLUS_CONF_OPTS += --without-qt5
> +endif

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH/next 1/1] package/log4cplus: add optional qt5 dependency
  2019-03-03 10:12 [Buildroot] [PATCH/next 1/1] package/log4cplus: add optional qt5 dependency Fabrice Fontaine
  2019-03-07 22:13 ` Thomas Petazzoni
@ 2019-03-25 16:19 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2019-03-25 16:19 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-03-25 16:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-03 10:12 [Buildroot] [PATCH/next 1/1] package/log4cplus: add optional qt5 dependency Fabrice Fontaine
2019-03-07 22:13 ` Thomas Petazzoni
2019-03-25 16:19 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.