From: James McCoy <jamessan@jamessan.com>
Date: Fri, 22 Jul 2016 03:30:32 +0000 (-0400)
Subject: [PATCH] Find libmsgpackc in Multi-Arch library paths
X-Git-Tag: archive/raspbian/0.1.4+dfsg-2+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=67286e0bd89e268e0defe806ccea24a132a71afa;p=webdis.git

[PATCH] Find libmsgpackc in Multi-Arch library paths

The msgpack library may be present in /usr/lib or /usr/lib/$arch,
but only the former is being searched.  Check both places and fix the
library name to use the C lib (libmsgpackc) rather than the C++ lib
(libmsgpack).

Signed-off-by: James McCoy <jamessan@jamessan.com>

Gbp-Pq: Name msgpack-clib.patch
---

diff --git a/Makefile b/Makefile
index 40a7787..11bd9cd 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,11 @@ ifneq ($(findstring yes,$(shell pkg-config --exists msgpack && echo yes)),)
 	CFLAGS += -DMSGPACK=1 $(shell pkg-config --cflags msgpack)
 	LDFLAGS += $(shell pkg-config --libs msgpack)
 else
-	MSGPACK_LIB=$(shell ls /usr/lib/libmsgpack.so 2>/dev/null)
+	MSGPACK_LIB=$(shell ls /usr/lib/libmsgpackc.so /usr/lib/*/libmsgpackc.so 2>/dev/null)
 	ifneq ($(strip $(MSGPACK_LIB)),)
 		FORMAT_OBJS += formats/msgpack.o
 		CFLAGS += -DMSGPACK=1
-		LDFLAGS += -lmsgpack
+		LDFLAGS += -lmsgpackc
 	endif
 endif