Browse Source

Merge pull request #5450 from ja-pa/poco_update

poco: update to version 1.8.1
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
commit
82ac73701e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
  1. +2
    -2
      libs/poco/Makefile
  2. +9
    -9
      libs/poco/patches/200-strerror.patch

+ 2
- 2
libs/poco/Makefile View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=poco PKG_NAME:=poco
PKG_VERSION:=1.7.7
PKG_VERSION:=1.8.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=http://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION)
PKG_HASH:=17783e30f5ef9c852544ac0e9d1fd316c4804317026059a9d6aad798b61c77f8
PKG_HASH:=2e4c07ac73174ee06c7e2c7cf2b7642a5b3aea81d0203e1c069b32ac4a8ecfbc
PKG_LICENSE:=BSL-1.0 PKG_LICENSE:=BSL-1.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE


+ 9
- 9
libs/poco/patches/200-strerror.patch View File

@ -1,11 +1,11 @@
--- a/Foundation/src/Error.cpp --- a/Foundation/src/Error.cpp
+++ b/Foundation/src/Error.cpp +++ b/Foundation/src/Error.cpp
@@ -66,7 +66,7 @@
without -D_GNU_SOURCE is needed, otherwise the GNU version is
preferred.
*/
-#if defined _GNU_SOURCE && !POCO_ANDROID
+#if (defined _GNU_SOURCE && (defined __GLIBC__ || defined __UCLIBC__)) && !POCO_ANDROID
char errmsg[256] = "";
return std::string(strerror_r(errorCode, errmsg, 256));
#elif (_XOPEN_SOURCE >= 600) || POCO_ANDROID
@@ -70,7 +70,7 @@ namespace Poco {
#if (_XOPEN_SOURCE >= 600) || POCO_ANDROID || __APPLE__
setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
-#elif _GNU_SOURCE
+#elif (_GNU_SOURCE && (defined __GLIBC__ || defined __UCLIBC__))
setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
#else
setMessage(strerror(err));

Loading…
Cancel
Save