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)); +