From 83c21577a457013f6cfa7f516999a2e6dd6b81f3 Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Mon, 7 Oct 2019 06:03:10 -0400 Subject: [PATCH 1/5] poco: Changed poco version to all, and from minimal build to typical. Signed-off-by: Jakub Jalowiczor --- libs/poco/Makefile | 11 +++++------ libs/poco/patches/100-configure.patch | 20 ++++++++------------ libs/poco/patches/200-strerror.patch | 7 ++++--- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index 9eba6cbfb..97c7bcd29 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=poco -PKG_VERSION:=1.9.0 +PKG_VERSION:=1.9.0-all PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=a0a5a03d87c585f1a43def33bfc52c0c34a528e43a7b13bc83841a7c00adde39 +PKG_HASH:=b6e33898588e74337efec4e8d8b9b277bb653b08318a79215f9aa4a3ff1ea9fd PKG_LICENSE:=BSL-1.0 PKG_LICENSE_FILES:=LICENSE @@ -47,13 +47,12 @@ CONFIGURE_ARGS += \ --no-fpenvironment \ --no-sharedmemory \ --no-wstring \ - --poquito \ - --minimal \ + --typical \ --shared 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{Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings}.so* $(1)/usr/lib/ endef define Build/InstallDev @@ -61,7 +60,7 @@ 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{Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings}.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,poco)) diff --git a/libs/poco/patches/100-configure.patch b/libs/poco/patches/100-configure.patch index 01ceb6767..39a1198b4 100644 --- a/libs/poco/patches/100-configure.patch +++ b/libs/poco/patches/100-configure.patch @@ -1,15 +1,11 @@ --- a/configure +++ b/configure -@@ -237,9 +237,9 @@ while [ $# -ge 1 ]; do - ;; +@@ -238,6 +238,6 @@ - *) -- showhelp -- exit 1 -- ;; -+# showhelp -+# exit 1 -+# ;; - esac - - shift + *) +- showhelp +- exit 1 ++# showhelp ++# exit 1 + ;; + esac diff --git a/libs/poco/patches/200-strerror.patch b/libs/poco/patches/200-strerror.patch index 0ff0ce5ed..ca7e0858e 100644 --- a/libs/poco/patches/200-strerror.patch +++ b/libs/poco/patches/200-strerror.patch @@ -3,9 +3,10 @@ @@ -70,7 +70,7 @@ namespace Poco { #if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__ - setMessage(strerror_r(err, _buffer, sizeof(_buffer))); + setMessage(strerror_r(err, _buffer, sizeof(_buffer))); -#elif _GNU_SOURCE +#elif (_GNU_SOURCE && (defined __GLIBC__ || defined __UCLIBC__)) - setMessage(strerror_r(err, _buffer, sizeof(_buffer))); + setMessage(strerror_r(err, _buffer, sizeof(_buffer))); #else - setMessage(strerror(err)); + setMessage(strerror(err)); + From d9106a3a90e4bbb7ad7fc36a961a7388ba81fe9b Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Mon, 7 Oct 2019 08:26:32 -0400 Subject: [PATCH 2/5] poco: Package version changed Signed-off-by: Jakub Jalowiczor --- libs/poco/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index 97c7bcd29..cf7280709 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -9,11 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=poco -PKG_VERSION:=1.9.0-all +_PKG_VERSION:=1.9.0 +PKG_VERSION:=$(_PKG_VERSION)-all PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(_PKG_VERSION) PKG_HASH:=b6e33898588e74337efec4e8d8b9b277bb653b08318a79215f9aa4a3ff1ea9fd PKG_LICENSE:=BSL-1.0 From f386733833f75bb0fb7e64d3786ff97ca3e01843 Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Mon, 7 Oct 2019 09:11:11 -0400 Subject: [PATCH 3/5] poco: Minor changes Signed-off-by: Jakub Jalowiczor --- libs/poco/Makefile | 2 +- libs/poco/patches/100-configure.patch | 20 ++++++++++++-------- libs/poco/patches/200-strerror.patch | 7 +++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index cf7280709..1496fcd5b 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -31,7 +31,7 @@ define Package/poco CATEGORY:=Libraries TITLE:=Poco C++ libraries URL:=https://www.pocoproject.org/ - DEPENDS:=+libstdcpp +libpthread +librt @!arc + DEPENDS:=+libstdcpp +libpthread +librt +libopenssl @!arc MAINTAINER:=Jean-Michel Julien endef diff --git a/libs/poco/patches/100-configure.patch b/libs/poco/patches/100-configure.patch index 39a1198b4..01ceb6767 100644 --- a/libs/poco/patches/100-configure.patch +++ b/libs/poco/patches/100-configure.patch @@ -1,11 +1,15 @@ --- a/configure +++ b/configure -@@ -238,6 +238,6 @@ +@@ -237,9 +237,9 @@ while [ $# -ge 1 ]; do + ;; - *) -- showhelp -- exit 1 -+# showhelp -+# exit 1 - ;; - esac + *) +- showhelp +- exit 1 +- ;; ++# showhelp ++# exit 1 ++# ;; + esac + + shift diff --git a/libs/poco/patches/200-strerror.patch b/libs/poco/patches/200-strerror.patch index ca7e0858e..0ff0ce5ed 100644 --- a/libs/poco/patches/200-strerror.patch +++ b/libs/poco/patches/200-strerror.patch @@ -3,10 +3,9 @@ @@ -70,7 +70,7 @@ namespace Poco { #if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__ - setMessage(strerror_r(err, _buffer, sizeof(_buffer))); + setMessage(strerror_r(err, _buffer, sizeof(_buffer))); -#elif _GNU_SOURCE +#elif (_GNU_SOURCE && (defined __GLIBC__ || defined __UCLIBC__)) - setMessage(strerror_r(err, _buffer, sizeof(_buffer))); + setMessage(strerror_r(err, _buffer, sizeof(_buffer))); #else - setMessage(strerror(err)); - + setMessage(strerror(err)); From c553c0a7a5878b267df9bd9f501ba383b79f8789 Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Wed, 9 Oct 2019 06:34:25 -0400 Subject: [PATCH 4/5] poco: A new variant of poco library poco-all Signed-off-by: Jakub Jalowiczor --- libs/poco/Makefile | 51 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index 1496fcd5b..24cfb6d6f 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -9,13 +9,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=poco -_PKG_VERSION:=1.9.0 -PKG_VERSION:=$(_PKG_VERSION)-all PKG_RELEASE:=2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(_PKG_VERSION) +ifeq ($(BUILD_VARIANT),all) +PKG_VERSION:=1.9.0-all PKG_HASH:=b6e33898588e74337efec4e8d8b9b277bb653b08318a79215f9aa4a3ff1ea9fd +else +PKG_VERSION:=1.9.0 +PKG_HASH:=a0a5a03d87c585f1a43def33bfc52c0c34a528e43a7b13bc83841a7c00adde39 +endif + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION) PKG_LICENSE:=BSL-1.0 PKG_LICENSE_FILES:=LICENSE @@ -23,6 +28,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) include $(INCLUDE_DIR)/package.mk @@ -31,8 +37,9 @@ define Package/poco CATEGORY:=Libraries TITLE:=Poco C++ libraries URL:=https://www.pocoproject.org/ - DEPENDS:=+libstdcpp +libpthread +librt +libopenssl @!arc + DEPENDS:=+libstdcpp +libpthread +librt @!arc MAINTAINER:=Jean-Michel Julien + VARIANT:=minimal endef define Package/poco/description @@ -41,6 +48,22 @@ define Package/poco/description run on desktop, server and embedded systems. endef +define Package/poco-all + $(call Package/poco) + SECTION:=libs + CATEGORY:=Libraries + TITLE+=(Complete Edition) + DEPENDS+=+libopenssl + VARIANT:=all +endef + +define Package/poco-all/description + POrtable COmponents, a modern and powerful open source C++ class libraries + and frameworks for building network and internet-based applications that + run on desktop, server and embedded systems. The Complete Edition contains + all libraries. +endef + CONFIGURE_ARGS += \ --config=Linux \ --no-tests \ @@ -48,10 +71,23 @@ CONFIGURE_ARGS += \ --no-fpenvironment \ --no-sharedmemory \ --no-wstring \ - --typical \ --shared +ifeq ($(BUILD_VARIANT),all) + CONFIGURE_ARGS += \ + --typical +else + CONFIGURE_ARGS += \ + --poquito \ + --minimal +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/ +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/ endef @@ -61,7 +97,8 @@ 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,Crypto,NetSSL,Encodings}.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,JSON,Net,Util}.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,poco)) +$(eval $(call BuildPackage,poco-all)) From 3948931926beb8a1c7dede855c5a30494259475e Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Wed, 9 Oct 2019 07:00:57 -0400 Subject: [PATCH 5/5] 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