From cd2f791fa5a634820465dfbf090057d5bde7313a Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Wed, 9 Oct 2019 07:00:57 -0400 Subject: [PATCH 1/2] poco: Minor changes Signed-off-by: Jakub Jalowiczor --- libs/poco/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index 24cfb6d6f..680e5001a 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -10,16 +10,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=poco PKG_RELEASE:=2 +PKG_VERSION:=1.9.0 ifeq ($(BUILD_VARIANT),all) -PKG_VERSION:=1.9.0-all +_PKG_VERSION:=${PKG_VERSION}-all PKG_HASH:=b6e33898588e74337efec4e8d8b9b277bb653b08318a79215f9aa4a3ff1ea9fd else -PKG_VERSION:=1.9.0 +_PKG_VERSION:=${PKG_VERSION} PKG_HASH:=a0a5a03d87c585f1a43def33bfc52c0c34a528e43a7b13bc83841a7c00adde39 endif -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(_PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION) PKG_LICENSE:=BSL-1.0 @@ -28,7 +29,7 @@ PKG_CPE_ID:=cpe:/a:pocoproject:poco PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(_PKG_VERSION) include $(INCLUDE_DIR)/package.mk From 4712deffa57c9f919b1e60238daff7d164f6a695 Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Mon, 21 Oct 2019 10:22:49 -0400 Subject: [PATCH 2/2] 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))