diff options
author | André Draszik <andre.draszik@jci.com> | 2019-03-07 16:11:12 -0500 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-03-24 18:44:58 -0700 |
commit | af237f985f9cdf5c83390ec7a6be00031852c241 (patch) | |
tree | e05db5a16235e0c3c9b4ea40138ca97896de78db /meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb | |
parent | 6cc951d6578db9567a474f7eb577b71ecdbe3ec9 (diff) | |
download | meta-openembedded-af237f985f9cdf5c83390ec7a6be00031852c241.tar.gz |
mosquitto: fully switch over to using PACKAGECONFIG_CONFARGS
Convert all other instances of explicit PACKAGECONFIG uses
to the PACKAGECONFIG_CONFARGS infrastructure.
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Damien Riegel <damien.riegel@gmail.com>
[Damien Riegel: backport from master]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb')
-rw-r--r-- | meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb index 52252787d..06c1d67da 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb | |||
@@ -24,20 +24,16 @@ PACKAGECONFIG ??= "ssl uuid \ | |||
24 | ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ | 24 | ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ |
25 | " | 25 | " |
26 | 26 | ||
27 | PACKAGECONFIG[dns-srv] = ",,c-ares" | 27 | PACKAGECONFIG[dns-srv] = "WITH_SRV=yes,WITH_SRV=no,c-ares" |
28 | PACKAGECONFIG[ssl] = ",,openssl" | 28 | PACKAGECONFIG[ssl] = "WITH_TLS=yes WITH_TLS_PSK=yes,WITH_TLS=no WITH_TLS_PSK=no,openssl" |
29 | PACKAGECONFIG[uuid] = ",,util-linux" | 29 | PACKAGECONFIG[uuid] = "WITH_UUID=yes,WITH_UUID=no,util-linux" |
30 | PACKAGECONFIG[systemd] = "WITH_SYSTEMD=yes,WITH_SYSTEMD=no,systemd" | 30 | PACKAGECONFIG[systemd] = "WITH_SYSTEMD=yes,WITH_SYSTEMD=no,systemd" |
31 | PACKAGECONFIG[websockets] = ",,libwebsockets" | 31 | PACKAGECONFIG[websockets] = "WITH_WEBSOCKETS=yes,WITH_WEBSOCKETS=no,libwebsockets" |
32 | 32 | ||
33 | EXTRA_OEMAKE = " \ | 33 | EXTRA_OEMAKE = " \ |
34 | prefix=${prefix} \ | 34 | prefix=${prefix} \ |
35 | mandir=${mandir} \ | 35 | mandir=${mandir} \ |
36 | localedir=${localedir} \ | 36 | localedir=${localedir} \ |
37 | ${@bb.utils.contains('PACKAGECONFIG', 'dns-srv', 'WITH_SRV=yes', 'WITH_SRV=no', d)} \ | ||
38 | ${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \ | ||
39 | ${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes', 'WITH_UUID=no', d)} \ | ||
40 | ${@bb.utils.contains('PACKAGECONFIG', 'websockets', 'WITH_WEBSOCKETS=yes', 'WITH_WEBSOCKETS=no', d)} \ | ||
41 | ${PACKAGECONFIG_CONFARGS} \ | 37 | ${PACKAGECONFIG_CONFARGS} \ |
42 | STRIP=/bin/true \ | 38 | STRIP=/bin/true \ |
43 | WITH_DOCS=no \ | 39 | WITH_DOCS=no \ |