Mercurial > mxe-octave
changeset 557:ca50d0553062
use winsock2 instead of winsock in packages freetds and openssl (by Mark Brand)
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Wed, 02 Dec 2009 12:31:55 +0100 |
| parents | cd5388014f49 |
| children | 6957b466d45a |
| files | src/freetds.mk src/openssl.mk |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/freetds.mk Wed Dec 02 10:52:26 2009 +0100 +++ b/src/freetds.mk Wed Dec 02 12:31:55 2009 +0100 @@ -40,7 +40,10 @@ endef define $(PKG)_BUILD - # Beware --with-gnutls broken detection. + # package uses winsock2.h, so it should link to ws2_32 instead of wsock32 + $(SED) 's,wsock32,ws2_32,g' -i '$(1)'/configure + + # beware --with-gnutls broken detection cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \
--- a/src/openssl.mk Wed Dec 02 10:52:26 2009 +0100 +++ b/src/openssl.mk Wed Dec 02 12:31:55 2009 +0100 @@ -44,6 +44,12 @@ # http://wagner.pp.ru/~vitus/articles/openssl-mingw.html $(SED) 's,^$$IsMK1MF=1.*,,' -i '$(1)'/Configure $(SED) 's,static type _hide_##name,type _hide_##name,' -i '$(1)'/e_os2.h + + # use winsock2 instead of winsock + $(SED) 's,wsock32,ws2_32,g' -i '$(1)'/Configure + find '$(1)' -type f -exec \ + $(SED) 's,winsock\.h,winsock2.h,g' -i {} \; + cd '$(1)' && CC='$(TARGET)-gcc' ./Configure \ mingw \ zlib \