From f386733833f75bb0fb7e64d3786ff97ca3e01843 Mon Sep 17 00:00:00 2001 From: Jakub Jalowiczor Date: Mon, 7 Oct 2019 09:11:11 -0400 Subject: [PATCH] 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));