Source: webdis
Version: 0.1.1-2.1
Severity: important
Tags: patch

I've prepared a new upload of msgpack in experimental in which the
library has been made Multi-Arch.  This is causing webdis to fail
because of how it tries to find msgpack.

I also noticed that it's looking for the C++ lib (libmsgpack) rather
than the C lib (libmsgpackc).  The attached patch fixes those two
issues.

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, arm64

Kernel: Linux 4.3.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
>From 917c30b64aa2638ef06d8f6e2618cdc12da368d5 Mon Sep 17 00:00:00 2001
From: James McCoy <james...@debian.org>
Date: Sun, 17 Jan 2016 23:24:16 -0500
Subject: [PATCH] Search for msgpack 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).
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e2b4b58..6585f53 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,11 @@ CFLAGS ?= -O0 -ggdb -Wall -Wextra -I. -Ijansson/src -Ihttp-parser
 LDFLAGS ?= -levent -pthread
 
 # check for MessagePack
-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
 
 
-- 
2.7.0.rc3

Reply via email to