From 73228b160e90b7b30a9fd853da7551fce778f7e0 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Sun, 25 Nov 2018 17:08:55 +0000 Subject: [PATCH] Fix #914525. --- debian/changelog | 8 ++++++++ debian/patches/914525.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+) create mode 100644 debian/patches/914525.patch diff --git a/debian/changelog b/debian/changelog index 5897e455..64962237 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mosquitto (1.5.4-2) unstable; urgency=medium + + * debian/patches/914525.patch : Use pkg-config to get systemd libs + (Closes: #914525) + - This is needed to allow compilation on non-Linux systems. + + -- Roger A. Light Sun, 25 Nov 2018 13:52:16 +0000 + mosquitto (1.5.4-1) unstable; urgency=medium * New upstream release (Closes: #911104). diff --git a/debian/patches/914525.patch b/debian/patches/914525.patch new file mode 100644 index 00000000..2e4cae78 --- /dev/null +++ b/debian/patches/914525.patch @@ -0,0 +1,18 @@ +Description: Use pkg-config to get systemd libs to allow build on non-linux systems +Author: Roger Light +Forwarded: yes +--- a/config.mk ++++ b/config.mk +@@ -235,8 +235,10 @@ + endif + + ifeq ($(WITH_SYSTEMD),yes) +- BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_SYSTEMD +- BROKER_LIBS:=$(BROKER_LIBS) -lsystemd ++ ifneq ($(shell pkg-config --libs libsystemd),) ++ BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_SYSTEMD $(pkg-config --cflags libsystemd) ++ BROKER_LIBS:=$(BROKER_LIBS) $(pkg-config --libs libsystemd) ++ endif + endif + + ifeq ($(WITH_SRV),yes) diff --git a/debian/patches/series b/debian/patches/series index bb6bab2b..380236d1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +914525.patch debian-config.patch