diff options
Diffstat (limited to 'development/gsoap/gsoap-libtool.patch')
-rw-r--r-- | development/gsoap/gsoap-libtool.patch | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/development/gsoap/gsoap-libtool.patch b/development/gsoap/gsoap-libtool.patch index c62fed448eab0..a7563d2303c47 100644 --- a/development/gsoap/gsoap-libtool.patch +++ b/development/gsoap/gsoap-libtool.patch @@ -1,6 +1,6 @@ diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac ---- gsoap-2.8.orig/configure.ac 2013-12-18 20:58:31.000000000 +0100 -+++ gsoap-2.8/configure.ac 2014-01-16 11:54:26.730139349 +0100 +--- gsoap-2.8.orig/configure.ac 2015-11-10 18:52:20.000000000 +0100 ++++ gsoap-2.8/configure.ac 2015-11-22 09:28:38.711054796 +0100 @@ -16,8 +16,7 @@ AM_PROG_LEX AC_PROG_YACC @@ -11,7 +11,7 @@ diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL -@@ -235,15 +234,15 @@ +@@ -236,16 +235,16 @@ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_INCLUDES= SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" @@ -31,7 +31,7 @@ diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac fi if test -n "$OPENSSL"; then WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -255,7 +254,7 @@ +@@ -258,7 +257,7 @@ WSDL2H_EXTRA_FLAGS= SAMPLE_SSL_LIBS= SAMPLE_INCLUDES= @@ -41,8 +41,8 @@ diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac AC_SUBST(WSDL2H_EXTRA_FLAGS) AC_SUBST(WSDL2H_EXTRA_LIBS) diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am ---- gsoap-2.8.orig/gsoap/Makefile.am 2013-12-18 20:58:33.000000000 +0100 -+++ gsoap-2.8/gsoap/Makefile.am 2014-01-16 11:52:07.450827436 +0100 +--- gsoap-2.8.orig/gsoap/Makefile.am 2015-11-10 18:52:22.000000000 +0100 ++++ gsoap-2.8/gsoap/Makefile.am 2015-11-22 09:24:43.198046409 +0100 @@ -34,20 +34,30 @@ dom_cpp.cpp: dom.cpp $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp @@ -59,9 +59,9 @@ diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am -libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp -libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES -libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c --libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM +-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES -libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp --libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM +-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +SOVERSION = 0 + +libgsoap_la_SOURCES = stdsoap2.c dom.c @@ -77,44 +77,20 @@ diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am +libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES +libgsoapck___la_LDFLAGS = -version-info $(SOVERSION) +libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c -+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM ++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION) +libgsoapssl_la_LIBADD = -lssl -lcrypto -lz +libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp -+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM ++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES +libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION) +libgsoapssl___la_LIBADD = -lssl -lcrypto -lz BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) -diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am ---- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2013-12-18 20:58:36.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2014-01-16 11:52:07.450827436 +0100 -@@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/examples.wsdl - SOAPHEADER=$(srcdir)/examples.h - SOAP_CPP_SRC=soapC.cpp soapServer.cpp --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a -+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la - - $(SOAP_CPP_SRC) : $(WSDLINPUT) - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) -diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/samples/databinding/Makefile.am ---- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2013-12-18 20:58:36.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2014-01-16 11:52:07.460827315 +0100 -@@ -14,7 +14,7 @@ - WSDLINPUT=$(srcdir)/address.xsd - SOAPHEADER=$(srcdir)/address.h - SOAP_CPP_SRC=addressC.cpp --SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a -+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la - - $(SOAP_CPP_SRC) : $(WSDLINPUT) - $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/Makefile.defines ---- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2013-12-18 20:58:37.000000000 +0100 -+++ gsoap-2.8/gsoap/samples/Makefile.defines 2014-01-16 11:52:07.469827206 +0100 -@@ -15,13 +15,13 @@ +--- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2015-11-10 18:52:26.000000000 +0100 ++++ gsoap-2.8/gsoap/samples/Makefile.defines 2015-11-22 09:22:54.369042534 +0100 +@@ -13,13 +13,13 @@ SOAP_C_CORE=soapC.c SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE) SOAP_C_SERVER=soapServer.c $(SOAP_C_CORE) @@ -134,3 +110,27 @@ diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/M +SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la +SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.la +SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la +diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am +--- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2015-11-10 18:52:26.000000000 +0100 ++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2015-11-22 09:22:54.368042534 +0100 +@@ -14,7 +14,7 @@ + WSDLINPUT=$(srcdir)/examples.wsdl + SOAPHEADER=$(srcdir)/examples.h + SOAP_CPP_SRC=soapC.cpp soapServer.cpp +-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a ++SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la + + $(SOAP_CPP_SRC) : $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) +diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/samples/databinding/Makefile.am +--- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2015-11-10 18:52:26.000000000 +0100 ++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2015-11-22 09:22:54.368042534 +0100 +@@ -14,7 +14,7 @@ + WSDLINPUT=$(srcdir)/address.xsd + SOAPHEADER=$(srcdir)/address.h + SOAP_CPP_SRC=addressC.cpp +-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a ++SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la + + $(SOAP_CPP_SRC) : $(WSDLINPUT) + $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) |