From 4712deffa57c9f919b1e60238daff7d164f6a695 Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Mon, 21 Oct 2019 10:22:49 -0400 Subject: [PATCH] poco: Added changes to InstallDev section and conditions for poco libs. Signed-off-by: Jakub Jalowiczor --- libs/poco/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index 680e5001a..1b97fb739 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -77,20 +77,22 @@ CONFIGURE_ARGS += \ ifeq ($(BUILD_VARIANT),all) CONFIGURE_ARGS += \ --typical + POCO_LIBS={Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings} else CONFIGURE_ARGS += \ --poquito \ --minimal + POCO_LIBS={Foundation,XML,JSON,Net,Util} endif define Package/poco/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,JSON,Net,Util}.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ endef define Package/poco-all/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings}.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ endef define Build/InstallDev @@ -98,8 +100,9 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,JSON,Net,Util}.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ endef + $(eval $(call BuildPackage,poco)) $(eval $(call BuildPackage,poco-all))