mirror of https://git.wownero.com/dsc/mxe.git
converted sed hack to patch for package openssl
This commit is contained in:
parent
668411e93f
commit
ba1da77513
|
@ -0,0 +1,54 @@
|
||||||
|
This file is part of mingw-cross-env.
|
||||||
|
See doc/index.html for further information.
|
||||||
|
|
||||||
|
This patch has been taken from:
|
||||||
|
http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
|
||||||
|
|
||||||
|
diff -urN a/e_os.h b/e_os.h
|
||||||
|
--- a/e_os.h 2010-05-31 15:18:08.000000000 +0200
|
||||||
|
+++ b/e_os.h 2010-06-04 17:43:44.370181869 +0200
|
||||||
|
@@ -498,7 +498,7 @@
|
||||||
|
# endif
|
||||||
|
# if !defined(IPPROTO_IP)
|
||||||
|
/* winsock[2].h was included already? */
|
||||||
|
-# include <winsock.h>
|
||||||
|
+# include <winsock2.h>
|
||||||
|
# endif
|
||||||
|
# ifdef getservbyname
|
||||||
|
# undef getservbyname
|
||||||
|
diff -urN a/include/openssl/dtls1.h b/include/openssl/dtls1.h
|
||||||
|
--- a/include/openssl/dtls1.h 2010-04-14 02:17:29.000000000 +0200
|
||||||
|
+++ b/include/openssl/dtls1.h 2010-06-04 17:44:27.318182412 +0200
|
||||||
|
@@ -68,7 +68,7 @@
|
||||||
|
#endif
|
||||||
|
#ifdef OPENSSL_SYS_WIN32
|
||||||
|
/* Needed for struct timeval */
|
||||||
|
-#include <winsock.h>
|
||||||
|
+#include <winsock2.h>
|
||||||
|
#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
|
||||||
|
#include <sys/timeval.h>
|
||||||
|
#else
|
||||||
|
diff -urN a/ssl/dtls1.h b/ssl/dtls1.h
|
||||||
|
--- a/ssl/dtls1.h 2010-04-14 02:17:29.000000000 +0200
|
||||||
|
+++ b/ssl/dtls1.h 2010-06-04 17:44:27.318182412 +0200
|
||||||
|
@@ -68,7 +68,7 @@
|
||||||
|
#endif
|
||||||
|
#ifdef OPENSSL_SYS_WIN32
|
||||||
|
/* Needed for struct timeval */
|
||||||
|
-#include <winsock.h>
|
||||||
|
+#include <winsock2.h>
|
||||||
|
#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
|
||||||
|
#include <sys/timeval.h>
|
||||||
|
#else
|
||||||
|
diff -urN a/ssl/ssltest.c b/ssl/ssltest.c
|
||||||
|
--- a/ssl/ssltest.c 2010-01-24 17:57:38.000000000 +0100
|
||||||
|
+++ b/ssl/ssltest.c 2010-06-04 17:44:26.134181765 +0200
|
||||||
|
@@ -190,7 +190,7 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef OPENSSL_SYS_WINDOWS
|
||||||
|
-#include <winsock.h>
|
||||||
|
+#include <winsock2.h>
|
||||||
|
#else
|
||||||
|
#include OPENSSL_UNISTD
|
||||||
|
#endif
|
|
@ -21,10 +21,6 @@ define $(PKG)_UPDATE
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(PKG)_BUILD
|
define $(PKG)_BUILD
|
||||||
# although ws3_32 is used, winsock 1 headers are still referenced
|
|
||||||
find '$(1)' -type f -exec \
|
|
||||||
$(SED) -i 's,winsock\.h,winsock2.h,g' {} \;
|
|
||||||
|
|
||||||
cd '$(1)' && CC='$(TARGET)-gcc' ./Configure \
|
cd '$(1)' && CC='$(TARGET)-gcc' ./Configure \
|
||||||
mingw \
|
mingw \
|
||||||
zlib \
|
zlib \
|
||||||
|
|
Loading…
Reference in New Issue