gsoap-libtool.patch 6.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134
  1. diff -ur gsoap-2.8.orig/configure.in gsoap-2.8/configure.in
  2. --- gsoap-2.8.orig/configure.in 2011-10-22 23:12:11.000000000 +0200
  3. +++ gsoap-2.8/configure.in 2011-11-01 06:25:39.071999543 +0100
  4. @@ -16,8 +16,7 @@
  5. AM_PROG_LEX
  6. AC_PROG_YACC
  7. AC_PROG_CPP
  8. -AC_PROG_RANLIB
  9. -#AM_PROG_LIBTOOL
  10. +AM_PROG_LIBTOOL
  11. AC_PROG_LN_S
  12. AC_PROG_AWK
  13. AC_PROG_INSTALL
  14. @@ -226,13 +225,13 @@
  15. WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP"
  16. WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
  17. SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
  18. - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
  19. + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
  20. else
  21. AC_MSG_RESULT(no)
  22. WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
  23. - WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
  24. + WSDL2H_EXTRA_LIBS=
  25. SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
  26. - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
  27. + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
  28. fi
  29. if test -n "$OPENSSL"; then
  30. WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}"
  31. @@ -244,7 +243,7 @@
  32. WSDL2H_EXTRA_FLAGS=
  33. WSDL2H_EXTRA_LIBS=
  34. SAMPLE_SSL_LIBS=
  35. - WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
  36. + WSDL2H_SOAP_CPP_LIB="libgsoap++.la"
  37. fi
  38. AC_SUBST(WSDL2H_EXTRA_FLAGS)
  39. AC_SUBST(WSDL2H_EXTRA_LIBS)
  40. diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am
  41. --- gsoap-2.8.orig/gsoap/Makefile.am 2011-10-22 23:12:12.000000000 +0200
  42. +++ gsoap-2.8/gsoap/Makefile.am 2011-11-01 06:25:39.071999543 +0100
  43. @@ -34,20 +34,30 @@
  44. dom_cpp.cpp: dom.cpp
  45. $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp
  46. -lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a
  47. +lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
  48. -libgsoap_a_SOURCES = stdsoap2.c dom.c
  49. -libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
  50. -libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
  51. -libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
  52. -libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c
  53. -libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
  54. -libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
  55. -libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
  56. -libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c
  57. -libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
  58. -libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
  59. -libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
  60. +SOVERSION = 0
  61. +
  62. +libgsoap_la_SOURCES = stdsoap2.c dom.c
  63. +libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
  64. +libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
  65. +libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
  66. +libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
  67. +libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
  68. +libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
  69. +libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
  70. +libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
  71. +libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
  72. +libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
  73. +libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
  74. +libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
  75. +libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
  76. +libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
  77. +libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
  78. +libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
  79. +libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
  80. +libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
  81. +libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
  82. BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
  83. diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am
  84. --- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2011-10-22 23:12:14.000000000 +0200
  85. +++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2011-11-01 06:25:39.071999543 +0100
  86. @@ -14,7 +14,7 @@
  87. WSDLINPUT=$(srcdir)/examples.wsdl
  88. SOAPHEADER=$(srcdir)/examples.h
  89. SOAP_CPP_SRC=soapC.cpp soapServer.cpp
  90. -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
  91. +SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
  92. $(SOAP_CPP_SRC) : $(WSDLINPUT)
  93. $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
  94. diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/samples/databinding/Makefile.am
  95. --- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2011-10-22 23:12:15.000000000 +0200
  96. +++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2011-11-01 06:25:39.071999543 +0100
  97. @@ -14,7 +14,7 @@
  98. WSDLINPUT=$(srcdir)/address.xsd
  99. SOAPHEADER=$(srcdir)/address.h
  100. SOAP_CPP_SRC=addressC.cpp
  101. -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
  102. +SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
  103. $(SOAP_CPP_SRC) : $(WSDLINPUT)
  104. $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
  105. diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/Makefile.defines
  106. --- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2011-10-22 23:12:15.000000000 +0200
  107. +++ gsoap-2.8/gsoap/samples/Makefile.defines 2011-11-01 06:25:39.071999543 +0100
  108. @@ -15,13 +15,13 @@
  109. SOAP_C_CORE=soapC.c
  110. SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE)
  111. SOAP_C_SERVER=soapServer.c $(SOAP_C_CORE)
  112. -SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.a
  113. -SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.a
  114. -SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.a
  115. +SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.la
  116. +SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.la
  117. +SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.la
  118. SOAP_CPP_CORE=soapC.cpp
  119. SOAP_CPP_CLIENT=soapClient.cpp $(SOAP_CPP_CORE)
  120. SOAP_CPP_SERVER=soapServer.cpp $(SOAP_CPP_CORE)
  121. -SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
  122. -SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.a
  123. -SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.a
  124. +SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
  125. +SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.la
  126. +SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la