diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2012-07-02 07:26:07 -0600 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-02 15:27:17 +0200 |
| commit | 4e06bafe801223de132ca043a3f2e0baaf803ed4 (patch) | |
| tree | 5f92fa4d44c97614235fa73d9633884f319637b1 | |
| parent | c34ef6b710bd9f3a5beac3be856c970c70e68610 (diff) | |
Try to fix Windows build of curl
Change-Id: Ifd760cf91ef6c9afe10a110e9b8db2dcc53fd3c8
| -rw-r--r-- | curl/curl-7.19.7_win.patch | 19 | ||||
| -rw-r--r-- | curl/curl-7.26.0_mingw.patch (renamed from curl/curl-7.19.7_mingw.patch) | 4 | ||||
| -rw-r--r-- | curl/curl-7.26.0_win.patch | 34 | ||||
| -rw-r--r-- | curl/makefile.mk | 4 |
4 files changed, 38 insertions, 23 deletions
diff --git a/curl/curl-7.19.7_win.patch b/curl/curl-7.19.7_win.patch deleted file mode 100644 index bc59433b5ef1..000000000000 --- a/curl/curl-7.19.7_win.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100 -+++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100 -@@ -46,13 +46,13 @@ - # Stem for static libs and DLLs - # - LIB_NAME = libcurl --LIB_NAME_DEBUG = libcurld -+LIB_NAME_DEBUG = libcurl - - # - # Stem for DLL import libs - # --IMPLIB_NAME = libcurl_imp --IMPLIB_NAME_DEBUG = libcurld_imp -+IMPLIB_NAME = libcurl -+IMPLIB_NAME_DEBUG = libcurl - - !IFNDEF OPENSSL_PATH - OPENSSL_PATH = ../../openssl-0.9.8g diff --git a/curl/curl-7.19.7_mingw.patch b/curl/curl-7.26.0_mingw.patch index b0fa6736d901..54d1ef3d0036 100644 --- a/curl/curl-7.19.7_mingw.patch +++ b/curl/curl-7.26.0_mingw.patch @@ -1,5 +1,5 @@ ---- misc/curl-7.19.7/lib/setup.h 2009-10-29 05:21:58.000000000 +0900 -+++ misc/build/curl-7.19.7/lib/setup.h 2010-03-02 06:03:10.009500000 +0900 +--- misc/curl-7.26.0/lib/setup.h 2009-10-29 05:21:58.000000000 +0900 ++++ misc/build/curl-7.26.0/lib/setup.h 2010-03-02 06:03:10.009500000 +0900 @@ -40,6 +40,21 @@ #include "curl_config.h" diff --git a/curl/curl-7.26.0_win.patch b/curl/curl-7.26.0_win.patch new file mode 100644 index 000000000000..214b5a9389e7 --- /dev/null +++ b/curl/curl-7.26.0_win.patch @@ -0,0 +1,34 @@ +--- misc/curl-7.26.0/Makefile.msvc.names 2011-03-19 09:17:12.000000000 -0600 ++++ misc/build/curl-7.26.0/Makefile.msvc.names 2012-07-02 07:20:39.323448800 -0600 +@@ -43,7 +43,7 @@ + !ENDIF + + !IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == "" +-LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d ++LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL) + !ENDIF + + !IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == "" +@@ -51,7 +51,7 @@ + !ENDIF + + !IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == "" +-LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d ++LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL) + !ENDIF + + # -------------------------------------------- +@@ -59,11 +59,11 @@ + # -------------------------------------------- + + !IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == "" +-LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp ++LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL) + !ENDIF + + !IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == "" +-LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp ++LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG) + !ENDIF + + # -------------------------------------- diff --git a/curl/makefile.mk b/curl/makefile.mk index 3a0920936ee4..aab5be3db04e 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -48,9 +48,9 @@ PATCH_FILES=\ curl-aix.patch .IF "$(GUI)"=="WNT" - PATCH_FILES+=curl-7.19.7_win.patch + PATCH_FILES+=curl-7.26.0_win.patch .IF "$(COM)"=="GCC" - PATCH_FILES+=curl-7.19.7_mingw.patch + PATCH_FILES+=curl-7.26.0_mingw.patch .ENDIF .ENDIF |