diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch index a57b3ff23e..b64009b6d7 100644 --- a/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch +++ b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch @@ -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 Date: Sun, 19 May 2024 17:11:20 -0700 Subject: [PATCH] Provide strtod_l signature on non-glibc linux ( musl ) @@ -11,16 +11,18 @@ the automatic __GLIBC__ detection this patch adds is still needed on top. Upstream-Status: Pending Signed-off-by: Khem Raj --- - gsoap/stdsoap2.c | 8 ++++++-- - gsoap/stdsoap2.cpp | 8 ++++++-- - 2 files changed, 12 insertions(+), 4 deletions(-) - ---- a/gsoap/stdsoap2.cpp -+++ b/gsoap/stdsoap2.cpp -@@ -74,6 +74,11 @@ + gsoap/stdsoap2.c | 11 ++++++++--- + gsoap/stdsoap2.cpp | 11 ++++++++--- + 2 files changed, 16 insertions(+), 6 deletions(-) +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 @@ 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 *); @@ -29,7 +31,7 @@ Signed-off-by: Khem Raj #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; @@ -38,7 +40,7 @@ Signed-off-by: Khem Raj 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; } @@ -47,7 +49,7 @@ Signed-off-by: Khem Raj 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 @@ -56,12 +58,14 @@ Signed-off-by: Khem Raj err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ if (err != 0) soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); ---- a/gsoap/stdsoap2.c -+++ b/gsoap/stdsoap2.c -@@ -74,6 +74,11 @@ - +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 *); @@ -70,7 +74,7 @@ Signed-off-by: Khem Raj #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 +83,7 @@ Signed-off-by: Khem Raj 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 +92,7 @@ Signed-off-by: Khem Raj 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 @@ -97,5 +101,3 @@ Signed-off-by: Khem Raj 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 diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.144.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.146.bb similarity index 94% rename from meta-oe/recipes-support/gsoap/gsoap_2.8.144.bb rename to meta-oe/recipes-support/gsoap/gsoap_2.8.146.bb index 5d4c99256b..ca9919f4d0 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.144.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.146.bb @@ -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\d+(\.\d+)+)\.zip"