aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-06-27 15:25:52 -0700
committerKhem Raj <raj.khem@gmail.com>2018-06-27 22:17:33 -0700
commitd56219b4119901c223fd7929d3208c44e951c9d2 (patch)
treede05c0a017586d010978d9e721c64ecde2e669a3 /meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb
parent00d5219d6515982ecdbe2f3c5d9eff852ef02589 (diff)
downloadmeta-openembedded-contrib-d56219b4119901c223fd7929d3208c44e951c9d2.tar.gz
mosquitto: minor recipe cleanups
- Passing prefix, mandir and localedir via the Make command line allows patching of config.mk to be dropped. - The variable PREFIX isn't used anywhere in the mosquitto 1.4.15 Makefiles, so doesn't need to be passed on the Make command line. That means the default do_compile() from base.bbclass can be used and the recipe specific do_compile() can be dropped. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb')
-rw-r--r--meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb24
1 files changed, 13 insertions, 11 deletions
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb
index 8dd2124c41..f451687a68 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20 \
DEPENDS = "uthash"
SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
- file://0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch \
file://0002-uthash-remove-in-tree-version.patch \
file://mosquitto.service \
file://mosquitto.init \
@@ -27,20 +26,23 @@ PACKAGECONFIG ??= "ssl uuid"
PACKAGECONFIG[dns-srv] = ",,c-ares"
PACKAGECONFIG[ssl] = ",,openssl"
PACKAGECONFIG[uuid] = ",,util-linux"
-EXTRA_OEMAKE = "${@bb.utils.contains('PACKAGECONFIG', 'dns-srv', 'WITH_SRV=yes', 'WITH_SRV=no', d)} \
- STRIP=/bin/true \
- WITH_DOCS=no \
- ${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes', 'WITH_UUID=no', d)}"
-export LIB_SUFFIX="${@d.getVar('baselib', True).replace('lib', '')}"
+EXTRA_OEMAKE = " \
+ prefix=${prefix} \
+ mandir=${mandir} \
+ localedir=${localedir} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'dns-srv', 'WITH_SRV=yes', 'WITH_SRV=no', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes', 'WITH_UUID=no', d)} \
+ STRIP=/bin/true \
+ WITH_DOCS=no \
+"
-do_compile() {
- oe_runmake PREFIX=${prefix}
-}
+export LIB_SUFFIX = "${@d.getVar('baselib', True).replace('lib', '')}"
do_install() {
- oe_runmake install DESTDIR=${D}
+ oe_runmake 'DESTDIR=${D}' install
+
install -d ${D}${libdir}
install -m 0644 lib/libmosquitto.a ${D}${libdir}/