gsoap, bump version, cleanup (#8289)

This commit is contained in:
Schrijvers Luc
2023-04-06 09:04:42 +02:00
committed by GitHub
parent 359b0e5b68
commit 66339987d3
5 changed files with 35 additions and 366 deletions

View File

@@ -1,257 +0,0 @@
diff -Naur gsoap-2.7-original/Makefile.am gsoap-2.7/Makefile.am
--- gsoap-2.7-original/Makefile.am 2009-03-30 09:53:25.000000000 -0400
+++ gsoap-2.7/Makefile.am 2009-03-30 10:09:29.000000000 -0400
@@ -1,4 +1,5 @@
####### This is the input file for automake, which will generate Makefile.in ##########
+ACLOCAL_AMFLAGS = -I m4
SUBDIRS = gsoap
CLEANFILES = *~
diff -Naur gsoap-2.7-original/configure.in gsoap-2.7/configure.in
--- gsoap-2.7-original/configure.in 2009-03-30 09:53:22.000000000 -0400
+++ gsoap-2.7/configure.in 2009-03-30 10:09:05.000000000 -0400
@@ -3,6 +3,7 @@
AM_INIT_AUTOMAKE(gsoap, 2.7)
AC_CONFIG_SRCDIR([gsoap/stdsoap2.cpp])
AC_CANONICAL_HOST
+AC_CONFIG_MACRO_DIR([m4])
dnl AC_CONFIG_HEADER([config.h])
AM_CONFIG_HEADER(config.h)
@@ -15,7 +16,7 @@
AM_PROG_LEX
AC_PROG_YACC
AC_PROG_CPP
-AC_PROG_RANLIB
+LT_INIT
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_INSTALL
diff -Naur gsoap-2.7-original/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile gsoap-2.7/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile
--- gsoap-2.7-original/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile 2009-03-30 09:53:23.000000000 -0400
+++ gsoap-2.7/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile 2009-03-30 10:05:31.000000000 -0400
@@ -105,9 +105,7 @@
soaptest_SOURCES = ConsoleMain.cpp
soaptest_LDADD = \
- -lltdl \
- -lpthread
-
+ -lltdl
CLEANFILES = *~ .kdbgrc.soaptest
subdir = ConsoleServer
diff -Naur gsoap-2.7-original/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile.am gsoap-2.7/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile.am
--- gsoap-2.7-original/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile.am 2009-03-30 09:53:23.000000000 -0400
+++ gsoap-2.7/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile.am 2009-03-30 10:05:31.000000000 -0400
@@ -12,7 +12,5 @@
soaptest_SOURCES = ConsoleMain.cpp
soaptest_LDADD = \
- -lltdl \
- -lpthread
-
+ -lltdl
CLEANFILES=*~ .kdbgrc.soaptest
diff -Naur gsoap-2.7-original/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile.in gsoap-2.7/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile.in
--- gsoap-2.7-original/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile.in 2009-03-30 09:53:23.000000000 -0400
+++ gsoap-2.7/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/ConsoleServer/Makefile.in 2009-03-30 10:05:31.000000000 -0400
@@ -105,9 +105,7 @@
soaptest_SOURCES = ConsoleMain.cpp
soaptest_LDADD = \
- -lltdl \
- -lpthread
-
+ -lltdl
CLEANFILES = *~ .kdbgrc.soaptest
subdir = ConsoleServer
diff -Naur gsoap-2.7-original/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/mod_gsoap/config/Configuration gsoap-2.7/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/mod_gsoap/config/Configuration
--- gsoap-2.7-original/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/mod_gsoap/config/Configuration 2009-03-30 09:53:23.000000000 -0400
+++ gsoap-2.7/gsoap/mod_gsoap/mod_gsoap-0.6/apache_13/mod_gsoap/config/Configuration 2009-03-30 10:05:31.000000000 -0400
@@ -53,7 +53,7 @@
#
EXTRA_CFLAGS=-g
EXTRA_LDFLAGS=
-EXTRA_LIBS=-lpthread -lg++ -ldl
+EXTRA_LIBS=-lg++ -ldl
EXTRA_INCLUDES=-I/home/aberger/apache_gsoap.0.0.5
EXTRA_DEPS=
diff -Naur gsoap-2.7-original/gsoap/samples/dime/Makefile.am gsoap-2.7/gsoap/samples/dime/Makefile.am
--- gsoap-2.7-original/gsoap/samples/dime/Makefile.am 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/dime/Makefile.am 2009-03-30 10:05:31.000000000 -0400
@@ -14,5 +14,5 @@
dimeclient_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
dimeserver_SOURCES = dimeserver.cpp $(SOAPHEADER) $(SOAP_CPP_SERVER)
-dimeserver_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+dimeserver_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
diff -Naur gsoap-2.7-original/gsoap/samples/dime/Makefile.in gsoap-2.7/gsoap/samples/dime/Makefile.in
--- gsoap-2.7-original/gsoap/samples/dime/Makefile.in 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/dime/Makefile.in 2009-03-30 10:05:31.000000000 -0400
@@ -143,7 +143,7 @@
dimeclient_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
dimeserver_SOURCES = dimeserver.cpp $(SOAPHEADER) $(SOAP_CPP_SERVER)
-dimeserver_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+dimeserver_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
subdir = gsoap/samples/dime
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
diff -Naur gsoap-2.7-original/gsoap/samples/events/Makefile.am gsoap-2.7/gsoap/samples/events/Makefile.am
--- gsoap-2.7-original/gsoap/samples/events/Makefile.am 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/events/Makefile.am 2009-03-30 10:06:31.000000000 -0400
@@ -14,6 +14,6 @@
event_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS)
handler_SOURCES = handler.c $(SOAPHEADER) $(SOAP_C_SRC)
-handler_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+handler_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS)
diff -Naur gsoap-2.7-original/gsoap/samples/events/Makefile.in gsoap-2.7/gsoap/samples/events/Makefile.in
--- gsoap-2.7-original/gsoap/samples/events/Makefile.in 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/events/Makefile.in 2009-03-30 10:06:37.000000000 -0400
@@ -143,7 +143,7 @@
event_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS)
handler_SOURCES = handler.c $(SOAPHEADER) $(SOAP_C_SRC)
-handler_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+handler_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS)
subdir = gsoap/samples/events
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
diff -Naur gsoap-2.7-original/gsoap/samples/events++/Makefile.am gsoap-2.7/gsoap/samples/events++/Makefile.am
--- gsoap-2.7-original/gsoap/samples/events++/Makefile.am 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/events++/Makefile.am 2009-03-30 10:06:44.000000000 -0400
@@ -14,6 +14,6 @@
event_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
handler_SOURCES = handler.cpp $(SOAPHEADER) $(SOAP_CPP_CORE) soapEventService.cpp soapEventProxy.cpp
-handler_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+handler_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
diff -Naur gsoap-2.7-original/gsoap/samples/events++/Makefile.in gsoap-2.7/gsoap/samples/events++/Makefile.in
--- gsoap-2.7-original/gsoap/samples/events++/Makefile.in 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/events++/Makefile.in 2009-03-30 10:06:51.000000000 -0400
@@ -143,7 +143,7 @@
event_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
handler_SOURCES = handler.cpp $(SOAPHEADER) $(SOAP_CPP_CORE) soapEventService.cpp soapEventProxy.cpp
-handler_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+handler_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
subdir = gsoap/samples/events++
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
diff -Naur gsoap-2.7-original/gsoap/samples/magic/Makefile.am gsoap-2.7/gsoap/samples/magic/Makefile.am
--- gsoap-2.7-original/gsoap/samples/magic/Makefile.am 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/magic/Makefile.am 2009-03-30 10:06:58.000000000 -0400
@@ -13,4 +13,4 @@
magic_SOURCES = magic.cpp $(SOAPHEADER) $(SOAP_CPP_CLIENT)
magicserver_SOURCES = magicserver.cpp $(SOAPHEADER) $(SOAP_CPP_SERVER)
-magicserver_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+magicserver_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
diff -Naur gsoap-2.7-original/gsoap/samples/magic/Makefile.in gsoap-2.7/gsoap/samples/magic/Makefile.in
--- gsoap-2.7-original/gsoap/samples/magic/Makefile.in 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/magic/Makefile.in 2009-03-30 10:07:04.000000000 -0400
@@ -142,7 +142,7 @@
magic_SOURCES = magic.cpp $(SOAPHEADER) $(SOAP_CPP_CLIENT)
magicserver_SOURCES = magicserver.cpp $(SOAPHEADER) $(SOAP_CPP_SERVER)
-magicserver_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+magicserver_LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
subdir = gsoap/samples/magic
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
diff -Naur gsoap-2.7-original/gsoap/samples/mtom-stream/Makefile.am gsoap-2.7/gsoap/samples/mtom-stream/Makefile.am
--- gsoap-2.7-original/gsoap/samples/mtom-stream/Makefile.am 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/mtom-stream/Makefile.am 2009-03-30 10:07:10.000000000 -0400
@@ -11,5 +11,5 @@
SOAP_NS = mtom_stream_test.nsmap mtom_stream_test.wsdl
mtom_stream_SOURCES = mtom-stream-test.c $(SOAPHEADER) $(SOAP_C_SRC)
-mtom_stream_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+mtom_stream_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS)
diff -Naur gsoap-2.7-original/gsoap/samples/mtom-stream/Makefile.in gsoap-2.7/gsoap/samples/mtom-stream/Makefile.in
--- gsoap-2.7-original/gsoap/samples/mtom-stream/Makefile.in 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/mtom-stream/Makefile.in 2009-03-30 10:07:15.000000000 -0400
@@ -140,7 +140,7 @@
SOAP_NS = mtom_stream_test.nsmap mtom_stream_test.wsdl
mtom_stream_SOURCES = mtom-stream-test.c $(SOAPHEADER) $(SOAP_C_SRC)
-mtom_stream_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+mtom_stream_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS)
subdir = gsoap/samples/mtom-stream
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
diff -Naur gsoap-2.7-original/gsoap/samples/router/Makefile.am gsoap-2.7/gsoap/samples/router/Makefile.am
--- gsoap-2.7-original/gsoap/samples/router/Makefile.am 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/router/Makefile.am 2009-03-30 10:07:22.000000000 -0400
@@ -11,5 +11,5 @@
SOAP_NS = $(SOAP_NS_DEF)
router_SOURCES = router.c $(SOAPHEADER) $(SOAP_C_CLIENT)
-router_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+router_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS)
diff -Naur gsoap-2.7-original/gsoap/samples/router/Makefile.in gsoap-2.7/gsoap/samples/router/Makefile.in
--- gsoap-2.7-original/gsoap/samples/router/Makefile.in 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/router/Makefile.in 2009-03-30 10:07:28.000000000 -0400
@@ -140,7 +140,7 @@
SOAP_NS = $(SOAP_NS_DEF)
router_SOURCES = router.c $(SOAPHEADER) $(SOAP_C_CLIENT)
-router_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS) -lpthread
+router_LDADD = $(SOAP_C_LIB) $(SAMPLE_EXTRA_LIBS)
subdir = gsoap/samples/router
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
diff -Naur gsoap-2.7-original/gsoap/samples/ssl/Makefile.am gsoap-2.7/gsoap/samples/ssl/Makefile.am
--- gsoap-2.7-original/gsoap/samples/ssl/Makefile.am 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/ssl/Makefile.am 2009-03-30 10:07:34.000000000 -0400
@@ -12,8 +12,8 @@
sslclient_CFLAGS = -DWITH_OPENSSL -DWITH_GZIP
sslclient_SOURCES = sslclient.c $(SOAPHEADER) $(SOAP_C_CLIENT)
-sslclient_LDADD = $(SOAP_C_LIB_SSL) $(SAMPLE_EXTRA_LIBS) -lssl -lcrypto -lz -lpthread
+sslclient_LDADD = $(SOAP_C_LIB_SSL) $(SAMPLE_EXTRA_LIBS) -lssl -lcrypto -lz
sslserver_CFLAGS = -DWITH_OPENSSL -DWITH_GZIP
sslserver_SOURCES = sslserver.c $(SOAPHEADER) $(SOAP_C_SERVER)
-sslserver_LDADD = $(SOAP_C_LIB_SSL) $(SAMPLE_EXTRA_LIBS) -lssl -lcrypto -lz -lpthread
+sslserver_LDADD = $(SOAP_C_LIB_SSL) $(SAMPLE_EXTRA_LIBS) -lssl -lcrypto -lz
diff -Naur gsoap-2.7-original/gsoap/samples/ssl/Makefile.in gsoap-2.7/gsoap/samples/ssl/Makefile.in
--- gsoap-2.7-original/gsoap/samples/ssl/Makefile.in 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/ssl/Makefile.in 2009-03-30 10:07:40.000000000 -0400
@@ -141,11 +141,11 @@
sslclient_CFLAGS = -DWITH_OPENSSL -DWITH_GZIP
sslclient_SOURCES = sslclient.c $(SOAPHEADER) $(SOAP_C_CLIENT)
-sslclient_LDADD = $(SOAP_C_LIB_SSL) $(SAMPLE_EXTRA_LIBS) -lssl -lcrypto -lz -lpthread
+sslclient_LDADD = $(SOAP_C_LIB_SSL) $(SAMPLE_EXTRA_LIBS) -lssl -lcrypto -lz
sslserver_CFLAGS = -DWITH_OPENSSL -DWITH_GZIP
sslserver_SOURCES = sslserver.c $(SOAPHEADER) $(SOAP_C_SERVER)
-sslserver_LDADD = $(SOAP_C_LIB_SSL) $(SAMPLE_EXTRA_LIBS) -lssl -lcrypto -lz -lpthread
+sslserver_LDADD = $(SOAP_C_LIB_SSL) $(SAMPLE_EXTRA_LIBS) -lssl -lcrypto -lz
subdir = gsoap/samples/ssl
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
diff -Naur gsoap-2.7-original/gsoap/samples/webserver/Makefile gsoap-2.7/gsoap/samples/webserver/Makefile
--- gsoap-2.7-original/gsoap/samples/webserver/Makefile 2009-03-30 09:53:24.000000000 -0400
+++ gsoap-2.7/gsoap/samples/webserver/Makefile 2009-03-30 10:07:45.000000000 -0400
@@ -6,7 +6,7 @@
SOAPDOMCPP=../../dom.cpp
CC=gcc
CPP=g++
-LIBS=-lpthread -lz -lssl -lcrypto
+LIBS= -lz -lssl -lcrypto
COFLAGS=-O2
CWFLAGS=
CIFLAGS=-I../.. -I../../plugin

View File

@@ -1,12 +0,0 @@
diff -Naur gsoap-2.7-original/gsoap/stdsoap2.h gsoap-2.7/gsoap/stdsoap2.h
--- gsoap-2.7-original/gsoap/stdsoap2.h 2009-03-30 09:53:25.000000000 -0400
+++ gsoap-2.7/gsoap/stdsoap2.h 2009-03-30 09:54:54.000000000 -0400
@@ -676,7 +676,7 @@
# endif
#elif defined(SOCKLEN_T)
# define SOAP_SOCKLEN_T SOCKLEN_T
-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(OS390)
+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__HAIKU__)
# define SOAP_SOCKLEN_T socklen_t
#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
# define SOAP_SOCKLEN_T int

View File

@@ -7,15 +7,15 @@ MTOM/MIME/DIME attachments (streaming), SOAP-over-UDP, request-response and \
one-way messaging. The toolkit also supports WS-Addressing and WS-Security, \
with several other WS-* available or under development."
HOMEPAGE="https://www.genivia.com/dev.html"
COPYRIGHT="2000-2018 Robert van Engelen, Genivia Inc."
COPYRIGHT="2000-2023 Robert van Engelen, Genivia Inc."
LICENSE="GNU GPL v2"
REVISION="2"
SOURCE_URI="https://sourceforge.net/projects/gsoap2/files/gsoap-2.8/gsoap_2.8.75.zip"
CHECKSUM_SHA256="825cfc31d97090ab634d8739a57179e59e5ac6f6071878cdf3c32d8cb90b3649"
SOURCE_DIR="gsoap-2.8"
REVISION="1"
SOURCE_URI="https://sourceforge.net/projects/gsoap2/files/gsoap_$portVersion.zip"
CHECKSUM_SHA256="25ecad1bbc363494eb7ea95a68508e4c93cc20596fad9ebc196c6572bbbd3c08"
PATCHES="gsoap-$portVersion.patchset"
SOURCE_DIR="gsoap-2.8"
ARCHITECTURES="all !x86_gcc2 ?x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
@@ -105,3 +105,8 @@ INSTALL()
packageEntries devel \
"$developDir"
}
TEST()
{
make check
}

View File

@@ -0,0 +1,24 @@
From da91613cd0ed3f2a4b2a6b374fd32513231e9c46 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 6 Apr 2023 08:34:06 +0200
Subject: add Haiku to platforms, use libnetwork and libcrypto
diff --git a/configure.ac b/configure.ac
index 065d3cf..352ae84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,10 @@ case "${host}" in
*-nto-qnx) platform=QNX
SAMPLE_EXTRA_LIBS="-lsocket -lm"
;;
+ *-*-haiku*) platform=HAIKU
+ SAMPLE_EXTRA_LIBS="-lnetwork -lcrypto"
+ WSDL2H_EXTRA_LIBS="-lnetwork"
+ ;;
*) platform=UNKNOWN
SAMPLE_EXTRA_LIBS="-lm"
;;
--
2.37.3

View File

@@ -1,91 +0,0 @@
From d831a96dce022c30e971f51449bb5dd56e3b1a8e Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 19 Jan 2019 09:26:56 +0100
Subject: fix build
diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp
index 7382f9f..6ddadcc 100644
--- a/gsoap/stdsoap2.cpp
+++ b/gsoap/stdsoap2.cpp
@@ -18267,7 +18267,7 @@ time_t
SOAP_FMAC2
soap_timegm(struct tm *T)
{
-#if defined(HAVE_TIMEGM)
+#if defined(HAVE_TIMEGM) && !defined(__HAIKU__)
return timegm(T);
#else
time_t t, g, z;
diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
index f4df891..faaef1a 100644
--- a/gsoap/stdsoap2.h
+++ b/gsoap/stdsoap2.h
@@ -711,6 +711,30 @@ extern intmax_t __strtoull(const char*, char**, int);
# endif
#endif
+#if defined(__HAIKU__)
+# define LC_ALL_MASK 0
+# define LC_NUMERIC_MASK 0
+# define LC_MESSAGES_MASK 0
+# define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1)
+typedef void *locale_t;
+
+static inline void freelocale(locale_t loc)
+{
+ (void)loc;
+}
+static inline locale_t newlocale(int mask, const char * locale, locale_t base)
+{
+ (void)mask; (void)locale; (void)base;
+ return NULL;
+}
+
+static inline locale_t uselocale(locale_t loc)
+{
+ (void)loc;
+ return NULL;
+}
+#endif //Haiku
+
#ifdef WITH_C_LOCALE
# include <locale.h>
# if defined(WIN32) && !defined(CYGWIN)
@@ -995,7 +1019,7 @@ extern "C" {
# endif
#elif defined(SOCKLEN_T)
# define SOAP_SOCKLEN_T SOCKLEN_T
-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE)
+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) || defined(__HAIKU__)
# define SOAP_SOCKLEN_T socklen_t
#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
# define SOAP_SOCKLEN_T int
--
2.19.1
From cc048fe14f4bb3a19e6206b238d20931328c9206 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 19 Jan 2019 19:00:59 +0100
Subject: add Haiku to platforms, use libnetwork and libcrypto
diff --git a/configure.ac b/configure.ac
index 90a5090..54a725d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,10 @@ case "${host}" in
*-nto-qnx) platform=QNX
SAMPLE_EXTRA_LIBS="-lsocket -lm"
;;
+ *-*-haiku*) platform=HAIKU
+ SAMPLE_EXTRA_LIBS="-lnetwork -lcrypto"
+ WSDL2H_EXTRA_LIBS="-lnetwork"
+ ;;
*) platform=UNKNOWN ;;
esac
--
2.19.1