commit: 49d86e3fbe90ef95a393ebd628174f38b5a514a4 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat Aug 21 00:43:17 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Aug 21 00:44:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d86e3f
app-misc/mosquitto: Fix installation with USE=-ssl Closes: https://bugs.gentoo.org/806244 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...2.0.11-Fix-installation-using-WITH_TLS-no.patch | 29 ++++++++++++++++++++++ app-misc/mosquitto/mosquitto-2.0.11.ebuild | 4 +++ 2 files changed, 33 insertions(+) diff --git a/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch b/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch new file mode 100644 index 00000000000..0a08e2997f0 --- /dev/null +++ b/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch @@ -0,0 +1,29 @@ +From 342aa0ad1a645f468a24266f402d92541d4fd58a Mon Sep 17 00:00:00 2001 +From: Roger Light <ro...@atchoo.org> +Date: Fri, 20 Aug 2021 23:49:59 +0100 +Subject: [PATCH] Fix installation using WITH_TLS=no. + +Closes #2281. Thanks to Matt Turner. +--- + ChangeLog.txt | 3 +++ + apps/mosquitto_passwd/Makefile | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/apps/mosquitto_passwd/Makefile b/apps/mosquitto_passwd/Makefile +index 3238cf3e..1fbf5e12 100644 +--- a/apps/mosquitto_passwd/Makefile ++++ b/apps/mosquitto_passwd/Makefile +@@ -37,8 +37,10 @@ password_mosq.o : ../../src/password_mosq.c ../../src/password_mosq.h + ${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@ + + install : all ++ifeq ($(WITH_TLS),yes) + $(INSTALL) -d "${DESTDIR}$(prefix)/bin" + $(INSTALL) ${STRIP_OPTS} mosquitto_passwd "${DESTDIR}${prefix}/bin/mosquitto_passwd" ++endif + + uninstall : + -rm -f "${DESTDIR}${prefix}/bin/mosquitto_passwd" +-- +2.31.1 + diff --git a/app-misc/mosquitto/mosquitto-2.0.11.ebuild b/app-misc/mosquitto/mosquitto-2.0.11.ebuild index f8288904bbe..381c55f77b1 100644 --- a/app-misc/mosquitto/mosquitto-2.0.11.ebuild +++ b/app-misc/mosquitto/mosquitto-2.0.11.ebuild @@ -33,6 +33,10 @@ DEPEND="${PYTHON_DEPS} test? ( dev-util/cunit ) websockets? ( net-libs/libwebsockets[lejp] )" +PATCHES=( + "${FILESDIR}"/${PV}-Fix-installation-using-WITH_TLS-no.patch +) + _emake() { local LIBDIR=$(get_libdir) emake \
