From 9cef35b68f33ac1f332784fdfef61d3904c7db41 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 15 Aug 2014 11:23:08 +0200 Subject: [PATCH] libebml: properly support static only builds This commit adjusts the libebml package to not build a shared library when BR2_PREFER_STATIC_LIB=y. Fixes: http://autobuild.buildroot.org/results/262/26279f72b6c5708f363b3cce2102afa0eccc3a72/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libebml/libebml.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/package/libebml/libebml.mk b/package/libebml/libebml.mk index e555922060..618ef1a915 100644 --- a/package/libebml/libebml.mk +++ b/package/libebml/libebml.mk @@ -11,16 +11,27 @@ LIBEBML_INSTALL_STAGING = YES LIBEBML_LICENSE = LGPLv2.1+ LIBEBML_LICENSE_FILES = LICENSE.LGPL +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIBEBML_MAKE_TARGETS = staticlib +LIBEBML_MAKE_INSTALL_TARGETS = install_staticlib install_headers +else +LIBEBML_MAKE_TARGETS = staticlib sharedlib +LIBEBML_MAKE_INSTALL_TARGETS = install_staticlib install_sharedlib install_headers +endif + define LIBEBML_BUILD_CMDS - $(MAKE) -C $(@D)/make/linux CROSS="$(CCACHE) $(TARGET_CROSS)" + $(MAKE) -C $(@D)/make/linux CROSS="$(CCACHE) $(TARGET_CROSS)" \ + $(LIBEBML_MAKE_TARGETS) endef define LIBEBML_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D)/make/linux prefix=$(STAGING_DIR)/usr install + $(MAKE) -C $(@D)/make/linux prefix=$(STAGING_DIR)/usr \ + $(LIBEBML_MAKE_INSTALL_TARGETS) endef define LIBEBML_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D)/make/linux prefix=$(TARGET_DIR)/usr install + $(MAKE) -C $(@D)/make/linux prefix=$(TARGET_DIR)/usr \ + $(LIBEBML_MAKE_INSTALL_TARGETS) endef $(eval $(generic-package)) -- 2.30.2