mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-14 16:07:25 +00:00
gsoap: Upgrade 2.8.144 -> 2.8.146
Upgrade to release 2.8.146: - Update compile-time configuration option `WITH_SELF_PIPE` to use `poll()` when available. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
1 parent
0381a62587
commit
74f29e6195
2 files changed
+56
-54
No files matched your search
+55
-53
@@ -1,4 +1,4 @@
|
||||
From 2b7a51556185539a0f9baef0f109e0814933d6b3 Mon Sep 17 00:00:00 2001
|
||||
From 2deca92607b4f399510e7e23c79192ebe3d2d15d Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 19 May 2024 17:11:20 -0700
|
||||
Subject: [PATCH] Provide strtod_l signature on non-glibc linux ( musl )
|
||||
@@ -11,57 +11,18 @@ the automatic __GLIBC__ detection this patch adds is still needed on top.
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
gsoap/stdsoap2.c | 8 ++++++--
|
||||
gsoap/stdsoap2.cpp | 8 ++++++--
|
||||
2 files changed, 12 insertions(+), 4 deletions(-)
|
||||
gsoap/stdsoap2.c | 11 ++++++++---
|
||||
gsoap/stdsoap2.cpp | 11 ++++++++---
|
||||
2 files changed, 16 insertions(+), 6 deletions(-)
|
||||
|
||||
--- a/gsoap/stdsoap2.cpp
|
||||
+++ b/gsoap/stdsoap2.cpp
|
||||
@@ -74,6 +74,11 @@
|
||||
|
||||
#include "stdsoap2.h"
|
||||
|
||||
+#if defined(__linux__) && !defined(__GLIBC__)
|
||||
+struct __locale_struct;
|
||||
+double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *);
|
||||
+#endif
|
||||
+
|
||||
#if GSOAP_VERSION != GSOAP_LIB_VERSION
|
||||
# error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE"
|
||||
#endif
|
||||
@@ -5460,7 +5465,7 @@
|
||||
{
|
||||
#if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
struct hostent_data ht_data;
|
||||
-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__) || defined(WITH_POSIX_GETHOSTBYNAME_R) || defined(WITH_MUSL)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
+#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__) || defined(WITH_POSIX_GETHOSTBYNAME_R) || defined(WITH_MUSL)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
int r;
|
||||
char *tmpbuf = soap->tmpbuf;
|
||||
size_t tmplen = sizeof(soap->tmpbuf);
|
||||
@@ -5493,7 +5498,7 @@
|
||||
hostent = NULL;
|
||||
soap->errnum = h_errno;
|
||||
}
|
||||
-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__) || defined(WITH_POSIX_GETHOSTBYNAME_R) || defined(WITH_MUSL)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
+#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__) || defined(WITH_POSIX_GETHOSTBYNAME_R) || defined(WITH_MUSL)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0)
|
||||
{
|
||||
if (tmpbuf != soap->tmpbuf)
|
||||
@@ -23409,7 +23414,7 @@
|
||||
{
|
||||
#ifndef WIN32
|
||||
# ifdef HAVE_STRERROR_R
|
||||
-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) || defined(WITH_POSIX_STRERROR_R) || defined(WITH_MUSL)
|
||||
+# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) || defined(WITH_POSIX_STRERROR_R) || defined(WITH_MUSL)
|
||||
err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */
|
||||
if (err != 0)
|
||||
soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error");
|
||||
diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c
|
||||
index 554b059..f4fcfd7 100644
|
||||
--- a/gsoap/stdsoap2.c
|
||||
+++ b/gsoap/stdsoap2.c
|
||||
@@ -74,6 +74,11 @@
|
||||
|
||||
@@ -74,6 +74,11 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
|
||||
|
||||
#include "stdsoap2.h"
|
||||
|
||||
|
||||
+#if defined(__linux__) && !defined(__GLIBC__)
|
||||
+struct __locale_struct;
|
||||
+double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *);
|
||||
@@ -70,7 +31,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
#if GSOAP_VERSION != GSOAP_LIB_VERSION
|
||||
# error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE"
|
||||
#endif
|
||||
@@ -5460,7 +5465,7 @@
|
||||
@@ -5467,7 +5472,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent,
|
||||
{
|
||||
#if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
struct hostent_data ht_data;
|
||||
@@ -79,7 +40,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
int r;
|
||||
char *tmpbuf = soap->tmpbuf;
|
||||
size_t tmplen = sizeof(soap->tmpbuf);
|
||||
@@ -5493,7 +5498,7 @@
|
||||
@@ -5500,7 +5505,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent,
|
||||
hostent = NULL;
|
||||
soap->errnum = h_errno;
|
||||
}
|
||||
@@ -88,7 +49,50 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0)
|
||||
{
|
||||
if (tmpbuf != soap->tmpbuf)
|
||||
@@ -23409,7 +23414,7 @@
|
||||
@@ -23432,7 +23437,7 @@ soap_strerror(struct soap *soap)
|
||||
{
|
||||
#ifndef WIN32
|
||||
# ifdef HAVE_STRERROR_R
|
||||
-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) || defined(WITH_POSIX_STRERROR_R) || defined(WITH_MUSL)
|
||||
+# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) || defined(WITH_POSIX_STRERROR_R) || defined(WITH_MUSL)
|
||||
err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */
|
||||
if (err != 0)
|
||||
soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error");
|
||||
diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp
|
||||
index 554b059..f4fcfd7 100644
|
||||
--- a/gsoap/stdsoap2.cpp
|
||||
+++ b/gsoap/stdsoap2.cpp
|
||||
@@ -74,6 +74,11 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
|
||||
|
||||
#include "stdsoap2.h"
|
||||
|
||||
+#if defined(__linux__) && !defined(__GLIBC__)
|
||||
+struct __locale_struct;
|
||||
+double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *);
|
||||
+#endif
|
||||
+
|
||||
#if GSOAP_VERSION != GSOAP_LIB_VERSION
|
||||
# error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE"
|
||||
#endif
|
||||
@@ -5467,7 +5472,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent,
|
||||
{
|
||||
#if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
struct hostent_data ht_data;
|
||||
-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__) || defined(WITH_POSIX_GETHOSTBYNAME_R) || defined(WITH_MUSL)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
+#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__) || defined(WITH_POSIX_GETHOSTBYNAME_R) || defined(WITH_MUSL)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
int r;
|
||||
char *tmpbuf = soap->tmpbuf;
|
||||
size_t tmplen = sizeof(soap->tmpbuf);
|
||||
@@ -5500,7 +5505,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent,
|
||||
hostent = NULL;
|
||||
soap->errnum = h_errno;
|
||||
}
|
||||
-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__) || defined(WITH_POSIX_GETHOSTBYNAME_R) || defined(WITH_MUSL)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
+#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__) || defined(WITH_POSIX_GETHOSTBYNAME_R) || defined(WITH_MUSL)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0)
|
||||
{
|
||||
if (tmpbuf != soap->tmpbuf)
|
||||
@@ -23432,7 +23437,7 @@ soap_strerror(struct soap *soap)
|
||||
{
|
||||
#ifndef WIN32
|
||||
# ifdef HAVE_STRERROR_R
|
||||
@@ -97,5 +101,3 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */
|
||||
if (err != 0)
|
||||
soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error");
|
||||
--
|
||||
2.43.0
|
||||
+1
-1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7eaf5d4df67c0db38549ba3c714a37d6 \
|
||||
|
||||
SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip \
|
||||
file://0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch"
|
||||
SRC_URI[sha256sum] = "b981818fbbd4bf9f6f4feac03136800f6e16a7d0b7515924ff7a2661ca26e581"
|
||||
SRC_URI[sha256sum] = "821af2ecfb93ca9dbd9bdae67fa0d57f9165fb4252bb40e23cd510dc4d49ec98"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/${BPN}2/files/"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}_(?P<pver>\d+(\.\d+)+)\.zip"
|
||||
Reference in new issue
Block a user