Skip to contentSkip to conversation

package/log4cplus: add optional qt5 dependency

PATCH New Fabrice Fontaine 3 participants 3 messages Mar 3, 2019 – Mar 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/log4cplus: add optional qt5 dependency

---
 package/log4cplus/log4cplus.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/log4cplus/log4cplus.mk +7 -0
index 0bc4fc9aa6..b632066de1 100644
@@ -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
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 package/log4cplus: add optional qt5 dependency

Hello Fabrice,

Quoted 4 lines · On Sun, 3 Mar 2019 11:12:52 +0100 Fabrice Fontaine…
---
 package/log4cplus/log4cplus.mk | 7 +++++++
 1 file changed, 7 insertions(+)

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

package/log4cplus/log4cplus.mk LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) · line 14

Quoted 9 lines
package/log4cplus/log4cplus.mk +1 -0
index 0bc4fc9aa6..b632066de1 100644
@@ -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.

package/log4cplus/log4cplus.mk LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) · line 19

Quoted 5 lines
package/log4cplus/log4cplus.mk +5 -0
+LOG4CPLUS_DEPENDENCIES += host-pkgconf qt5base
+LOG4CPLUS_CONF_OPTS += --with-qt5
+else
+LOG4CPLUS_CONF_OPTS += --without-qt5
+endif

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com