Mercurial > mxe-octave

comparison src/gsoap-3-winsock2.patch @ 1169:9ca7f1fa7c9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvements for package gsoap Don't insist on gnutls in native build. Do insist on gnutls in MinGW build. Switch to winsock2, since gnu tls requires it. Add missing -lgpg-error.
author Mark Brand <mabrand@mabrand.nl>
date Mon, 20 Sep 2010 12:00:00 +0200
parents
children c152d48bd9f1
comparison
equal deleted inserted replaced
1168:8ca3933f27ca 1169:9ca7f1fa7c9b
1 This file is part of mingw-cross-env.
2 See doc/index.html for further information.
3
4 This patch has been taken from:
5 http://sourceforge.net/tracker/?func=detail&aid=3071779&group_id=52781&atid=468023
6
7 diff -urN a/gsoap/doc/soapdoc2.html b/gsoap/doc/soapdoc2.html
8 --- a/gsoap/doc/soapdoc2.html 2010-09-19 01:19:28.000000000 +0200
9 +++ b/gsoap/doc/soapdoc2.html 2010-09-20 11:19:02.306175307 +0200
10 @@ -2599,10 +2599,10 @@
11 <div class="p"><!----></div>
12
13 <ul>
14 -<li> Win32 builds need winsock.dll (MS Visual C++ "wsock32.lib")
15 +<li> Win32 builds need winsock.dll (MS Visual C++ "ws2_32.lib")
16 To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
17 tab (the project file needs to be selected in the file view) and add
18 -"<i>wsock32.lib</i>" to the "<i>Object/library modules</i>" entry.<br /><br /></li>
19 +"<i>ws2_32.lib</i>" to the "<i>Object/library modules</i>" entry.<br /><br /></li>
20
21 <li> Use files with extension .cpp only (don't mix .c with .cpp).<br /><br /></li>
22
23 diff -urN a/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp b/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp
24 --- a/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp 2010-09-19 01:19:36.000000000 +0200
25 +++ b/gsoap/mod_gsoap/gsoap_win/isapi/samples/calc/winstuff.cpp 2010-09-20 11:18:57.285678758 +0200
26 @@ -6,7 +6,7 @@
27 #include <winsock2.h>
28
29 #if _MSC_VER > 1000
30 -#pragma comment(lib, "wsock32")
31 +#pragma comment(lib, "ws2_32")
32 #endif
33
34 static struct WSAInit { \
35 diff -urN a/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp b/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp
36 --- a/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp 2010-09-19 01:19:36.000000000 +0200
37 +++ b/gsoap/mod_gsoap/gsoap_win/isapi/samples/dime/winstuff.cpp 2010-09-20 11:18:57.281678556 +0200
38 @@ -8,7 +8,7 @@
39
40
41 #if _MSC_VER > 1000
42 -#pragma comment(lib, "wsock32")
43 +#pragma comment(lib, "ws2_32")
44 #endif
45
46 static struct WSAInit { \
47 diff -urN a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
48 --- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp 2010-09-19 01:19:57.000000000 +0200
49 +++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp 2010-09-20 11:18:57.769678579 +0200
50 @@ -52,10 +52,10 @@
51
52 Installation note:
53
54 -Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
55 +Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
56 To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
57 tab (the project file needs to be selected in the file view) and add
58 -"wsock32.lib" to the "Object/library modules" entry
59 +"ws2_32.lib" to the "Object/library modules" entry
60
61 On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
62 -fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
63 @@ -76,7 +76,7 @@
64 # ifdef UNDER_CE
65 # pragma comment(lib, "winsock.lib")
66 # else
67 -# pragma comment(lib, "wsock32.lib")
68 +# pragma comment(lib, "ws2_32.lib")
69 # endif
70 # pragma warning(disable : 4996) /* disable deprecation warnings */
71 # endif
72 diff -urN a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
73 --- a/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h 2010-09-19 01:19:57.000000000 +0200
74 +++ b/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h 2010-09-20 11:18:57.790175332 +0200
75 @@ -665,7 +665,7 @@
76 # define SOAP_GAI_STRERROR gai_strerrorA
77 # else
78 # ifndef __BORLANDC__
79 -# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
80 +# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
81 /* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
82 # else
83 # include <winsock2.h> /* Borland C */
84 diff -urN a/gsoap/samples/wsse/stdsoap2.c b/gsoap/samples/wsse/stdsoap2.c
85 --- a/gsoap/samples/wsse/stdsoap2.c 2010-09-19 01:20:10.000000000 +0200
86 +++ b/gsoap/samples/wsse/stdsoap2.c 2010-09-20 11:18:57.846175378 +0200
87 @@ -52,10 +52,10 @@
88
89 Installation note:
90
91 -Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
92 +Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
93 To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
94 tab (the project file needs to be selected in the file view) and add
95 -"wsock32.lib" to the "Object/library modules" entry
96 +"ws2_32.lib" to the "Object/library modules" entry
97
98 On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
99 -fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
100 @@ -76,7 +76,7 @@
101 # ifdef UNDER_CE
102 # pragma comment(lib, "winsock.lib")
103 # else
104 -# pragma comment(lib, "wsock32.lib")
105 +# pragma comment(lib, "ws2_32.lib")
106 # endif
107 # pragma warning(disable : 4996) /* disable deprecation warnings */
108 # endif
109 diff -urN a/gsoap/samples/wsse/stdsoap2.h b/gsoap/samples/wsse/stdsoap2.h
110 --- a/gsoap/samples/wsse/stdsoap2.h 2010-09-19 01:20:10.000000000 +0200
111 +++ b/gsoap/samples/wsse/stdsoap2.h 2010-09-20 11:18:57.874175123 +0200
112 @@ -665,7 +665,7 @@
113 # define SOAP_GAI_STRERROR gai_strerrorA
114 # else
115 # ifndef __BORLANDC__
116 -# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
117 +# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
118 /* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
119 # else
120 # include <winsock2.h> /* Borland C */
121 diff -urN a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c
122 --- a/gsoap/stdsoap2.c 2010-09-19 01:20:12.000000000 +0200
123 +++ b/gsoap/stdsoap2.c 2010-09-20 11:18:57.117678339 +0200
124 @@ -52,10 +52,10 @@
125
126 Installation note:
127
128 -Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
129 +Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
130 To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
131 tab (the project file needs to be selected in the file view) and add
132 -"wsock32.lib" to the "Object/library modules" entry
133 +"ws2_32.lib" to the "Object/library modules" entry
134
135 On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
136 -fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
137 @@ -76,7 +76,7 @@
138 # ifdef UNDER_CE
139 # pragma comment(lib, "winsock.lib")
140 # else
141 -# pragma comment(lib, "wsock32.lib")
142 +# pragma comment(lib, "ws2_32.lib")
143 # endif
144 # pragma warning(disable : 4996) /* disable deprecation warnings */
145 # endif
146 diff -urN a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp
147 --- a/gsoap/stdsoap2.cpp 2010-09-19 01:20:12.000000000 +0200
148 +++ b/gsoap/stdsoap2.cpp 2010-09-20 11:18:57.005678597 +0200
149 @@ -52,10 +52,10 @@
150
151 Installation note:
152
153 -Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
154 +Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
155 To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
156 tab (the project file needs to be selected in the file view) and add
157 -"wsock32.lib" to the "Object/library modules" entry
158 +"ws2_32.lib" to the "Object/library modules" entry
159
160 On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
161 -fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
162 @@ -76,7 +76,7 @@
163 # ifdef UNDER_CE
164 # pragma comment(lib, "winsock.lib")
165 # else
166 -# pragma comment(lib, "wsock32.lib")
167 +# pragma comment(lib, "ws2_32.lib")
168 # endif
169 # pragma warning(disable : 4996) /* disable deprecation warnings */
170 # endif
171 diff -urN a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h
172 --- a/gsoap/stdsoap2.h 2010-09-19 01:20:12.000000000 +0200
173 +++ b/gsoap/stdsoap2.h 2010-09-20 11:19:00.978175369 +0200
174 @@ -665,7 +665,7 @@
175 # define SOAP_GAI_STRERROR gai_strerrorA
176 # else
177 # ifndef __BORLANDC__
178 -# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
179 +# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
180 /* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
181 # else
182 # include <winsock2.h> /* Borland C */
183 diff -urN a/gsoap/VisualStudio2005/README.txt b/gsoap/VisualStudio2005/README.txt
184 --- a/gsoap/VisualStudio2005/README.txt 2010-09-19 01:20:13.000000000 +0200
185 +++ b/gsoap/VisualStudio2005/README.txt 2010-09-20 11:18:57.302175378 +0200
186 @@ -1,7 +1,7 @@
187
188 Visual Studio 2005 Solution files for soapcpp2 and wsdl2h.
189
190 -If not already installed, install the Platform SDK (R2) for winsock.h
191 +If not already installed, install the Platform SDK (R2) for winsock2.h
192
193 To build soapcpp2, first install Bison and Flex (in the default dirs):
194 http://gnuwin32.sourceforge.net/packages/bison.htm
195 diff -urN a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
196 --- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp 2010-09-19 01:20:14.000000000 +0200
197 +++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp 2010-09-20 11:18:57.389678446 +0200
198 @@ -52,10 +52,10 @@
199
200 Installation note:
201
202 -Win32 build needs winsock.dll (Visual C++ "wsock32.lib")
203 +Win32 build needs winsock.dll (Visual C++ "ws2_32.lib")
204 To do this in Visual C++ 6.0, go to "Project", "settings", select the "Link"
205 tab (the project file needs to be selected in the file view) and add
206 -"wsock32.lib" to the "Object/library modules" entry
207 +"ws2_32.lib" to the "Object/library modules" entry
208
209 On Mac OS X with gcc (GCC) 3.1 20020420 (prerelease) you MUST compile with
210 -fstack_check when using -O2 because gcc 3.1 has a bug that smashes the stack
211 @@ -76,7 +76,7 @@
212 # ifdef UNDER_CE
213 # pragma comment(lib, "winsock.lib")
214 # else
215 -# pragma comment(lib, "wsock32.lib")
216 +# pragma comment(lib, "ws2_32.lib")
217 # endif
218 # pragma warning(disable : 4996) /* disable deprecation warnings */
219 # endif
220 diff -urN a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
221 --- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h 2010-09-19 01:20:14.000000000 +0200
222 +++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h 2010-09-20 11:18:57.537678408 +0200
223 @@ -665,7 +665,7 @@
224 # define SOAP_GAI_STRERROR gai_strerrorA
225 # else
226 # ifndef __BORLANDC__
227 -# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
228 +# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
229 /* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
230 # else
231 # include <winsock2.h> /* Borland C */
232 diff -urN a/README.txt b/README.txt
233 --- a/README.txt 2010-09-19 01:20:17.000000000 +0200
234 +++ b/README.txt 2010-09-20 11:18:56.574175394 +0200
235 @@ -238,7 +238,7 @@
236
237 Win32 builds of clients and services requires winsock.dll. To do this in
238 Visual C++ 6.0, go to "Project", "settings", select the "Link" tab (the
239 -project file needs to be selected in the file view) and add "wsock32.lib" to
240 +project file needs to be selected in the file view) and add "ws2_32.lib" to
241 the "Object/library modules" entry. The distribution contains a Visual Studio
242 2005 project example in the 'samples/calc_vs2005' folder with the necessary
243 project settings to link libraries and automatically invoke to soapcpp2