From a598a7109c3b518898f38b433f865801d1c1163f Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 4 May 2017 00:34:14 +0530 Subject: [PATCH] tinyxml2: fix build in static libs configuration tinyxml2 can build both static and shared libraries. By default, only shared library is built. Shared/static builds are controlled using separate cmake flags BUILD_SHARED_LIBS and BUILD_STATIC_LIBS. In static libs configuration, we internally pass -DBUILD_SHARED_LIBS=OFF cmake flag to build system which disables both shared and static builds of library, resulting in failures while linking executable with library. So pass -DBUILD_STATIC_LIBS=ON cmake flag in case of static libs configuration. fixes: http://autobuild.buildroot.net/results/d30/d301bcbe5db26068b35eaa94bd816ae8cf8ef2e1 Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/tinyxml2/tinyxml2.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index bb1e16776f..e289ca9cf0 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -10,4 +10,8 @@ TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = readme.md TINYXML2_INSTALL_STAGING = YES +ifeq ($(BR2_STATIC_LIBS),y) +TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON +endif + $(eval $(cmake-package))