From fc613326db4f9a5115e132d25c07e8c448514c10 Mon Sep 17 00:00:00 2001 From: Alexandre Lision <alexandre.lision@gmail.com> Date: Sat, 23 Apr 2016 18:10:42 -0400 Subject: [PATCH] android: fix msgpack compilation on OSX Handling of run-path (@rpath) was not working when targeting android. This rpath is used to link with shared libraries. This patch disables the shared version of msgpack, since we only use the static one anyway Change-Id: I7100ac2a3ef8f1dbff382e0384ba4d5ad6e2b9ad Tuleap: #534 --- contrib/src/msgpack/rules.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/src/msgpack/rules.mak b/contrib/src/msgpack/rules.mak index fb73f18637..d8d255f7fc 100644 --- a/contrib/src/msgpack/rules.mak +++ b/contrib/src/msgpack/rules.mak @@ -9,6 +9,7 @@ endif MSGPACK_CMAKECONF := -DMSGPACK_CXX11=ON \ -DMSGPACK_BUILD_EXAMPLES=OFF \ + -DMSGPACK_ENABLE_SHARED=OFF \ -DCMAKE_INSTALL_LIBDIR=lib $(TARBALLS)/msgpack-c-$(MSGPACK_VERSION).tar.gz: -- GitLab