diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2021-08-20 17:43:17 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2021-08-20 17:44:39 -0700 |
| commit | 49d86e3fbe90ef95a393ebd628174f38b5a514a4 (patch) | |
| tree | 3aa30f04fd51f41b4c18ce3751fb3b7045a923dc /app-misc | |
| parent | profiles/package.mask: remove entry for app-accessibility/eflite (diff) | |
| download | gentoo-49d86e3fbe90ef95a393ebd628174f38b5a514a4.tar.gz gentoo-49d86e3fbe90ef95a393ebd628174f38b5a514a4.tar.bz2 gentoo-49d86e3fbe90ef95a393ebd628174f38b5a514a4.zip | |
app-misc/mosquitto: Fix installation with USE=-ssl
Closes: https://bugs.gentoo.org/806244
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch | 29 | ||||
| -rw-r--r-- | app-misc/mosquitto/mosquitto-2.0.11.ebuild | 4 |
2 files changed, 33 insertions, 0 deletions
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 000000000000..0a08e2997f0b --- /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 <roger@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 f8288904bbe2..381c55f77b19 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 \ |