mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
07d85c44998f42545175ee77c192b901b52a30ca
libreoffice/external/curl/curl-msvc.patch.1

28 lines
895 B
Groff
Raw Normal View History

curl: upgrade to version 7.33.0 - from curl-7.26.0.patch: * drop ADDCFLAGS stuff, must be some dmake relic * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000 which is unsupported (and ws2_32.lib is linked anyway...) * split out curl-freebsd.patch.1 - curl-7.26.0_win.patch: * drop the library renaming stuff - can be handled in Package and RepositoryExternal.mk without patch * rename the rest to curl-msvc.patch.1 - drop curl-aix.patch: presumably don't need special check for V7BETA since it's released now - drop curl-7.26.0_strlcat.patch (obsolete) Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0 Reviewed-on: https://gerrit.libreoffice.org/6642 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-11 14:42:13 +01:00
MSVC: using SOLARINC and EXCFLAGS
curl: actually use Makefile.vc10 instead of Makefile.vc9 ... they are currently identical but it seems more appropriate. Change-Id: I5ecd7209bc29f32a2f04299d35364a10fe381a35
2013-11-18 23:40:05 +01:00
--- curl/lib/Makefile.vc10 2012-05-24 12:07:02.000000000 -0400
+++ curl/lib/Makefile.vc10 2012-10-29 11:53:44.658809300 -0400
curl: upgrade to version 7.33.0 - from curl-7.26.0.patch: * drop ADDCFLAGS stuff, must be some dmake relic * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000 which is unsupported (and ws2_32.lib is linked anyway...) * split out curl-freebsd.patch.1 - curl-7.26.0_win.patch: * drop the library renaming stuff - can be handled in Package and RepositoryExternal.mk without patch * rename the rest to curl-msvc.patch.1 - drop curl-aix.patch: presumably don't need special check for V7BETA since it's released now - drop curl-7.26.0_strlcat.patch (obsolete) Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0 Reviewed-on: https://gerrit.libreoffice.org/6642 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-11 14:42:13 +01:00
@@ -117,7 +117,7 @@
ZLIBLIBSDLL = zdll.lib
ZLIBLIBS = zlib.lib
WINLIBS = ws2_32.lib wldap32.lib advapi32.lib
-CFLAGS = $(CFLAGS)
+CFLAGS = $(CFLAGS) $(EXCFLAGS)
CFGSET = FALSE
@@ -620,11 +620,11 @@
debug-dll-ssl-dll\libcurl.res \
debug-dll-zlib-dll\libcurl.res \
debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
- rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc
+ rc $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ libcurl.rc
release-dll\libcurl.res \
release-dll-ssl-dll\libcurl.res \
release-dll-zlib-dll\libcurl.res \
release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
- rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc
+ rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc
!ENDIF # End of case where a config was provided.
Reference in New Issue Copy Permalink