Commit 50ded1ab authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Sébastien Blin

contrib: bump gnutls, nettle, and iconv on windows

- patches gnutls 3.6.7 to build with visual studio

Change-Id: I8db69d51a75c9f52e0388856eb7bd1800ca80c75
parent a5bcbabe
set BUILD=%SRC%..\build
set GNUTLS_VERSION=018a4a655ad784b1ef4f1b311ff031aeed656090
set GNUTLS_URL=https://github.com/ShiftMediaProject/gnutls/archive/%GNUTLS_VERSION%.tar.gz
set GNUTLS_VERSION=3.6.7
set GNUTLS_URL=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-%GNUTLS_VERSION%.tar.xz
mkdir %BUILD%
if %USE_CACHE%==1 (
copy %CACHE_DIR%\%GNUTLS_VERSION%.tar.gz %cd%
copy %CACHE_DIR%\gnutls-%GNUTLS_VERSION%.tar.xz %cd%
) else (
%WGET_CMD% %GNUTLS_URL%
)
7z -y x %GNUTLS_VERSION%.tar.gz && 7z -y x %GNUTLS_VERSION%.tar -o%BUILD%
del %GNUTLS_VERSION%.tar && del %GNUTLS_VERSION%.tar.gz && del %BUILD%\pax_global_header
7z -y x gnutls-%GNUTLS_VERSION%.tar.xz && 7z -y x gnutls-%GNUTLS_VERSION%.tar -o%BUILD%
del gnutls-%GNUTLS_VERSION%.tar && del gnutls-%GNUTLS_VERSION%.tar.xz
rename %BUILD%\gnutls-%GNUTLS_VERSION% gnutls
cd %BUILD%\gnutls
%APPLY_CMD% %SRC%\gnutls\gnutls-no-egd.patch
%APPLY_CMD% %SRC%\gnutls\read-file-limits.h.patch
if "%1"=="uwp" (
%APPLY_CMD% %SRC%\gnutls\gnutls-uwp.patch
for /F "tokens=* usebackq" %%F in (`bash -c "pwd | grep /mnt/c/"`) do (
set NO_AUTO=%%F
)
if "%NO_AUTO%"=="" (
set ROOTPATH=/c/
) else (
set ROOTPATH=/mnt/c/
)
set UNIXPATH=%SRC:\=/%
set UNIXPATH=%ROOTPATH%%UNIXPATH:C:/=%
%APPLY_CMD% %SRC%\gnutls\gnutls-mscver.patch
bash -c "%PATCH_CMD% %UNIXPATH%gnutls/gnutls-3.6.7-win32-compat.patch"
bash -c "%PATCH_CMD% %UNIXPATH%gnutls/gnutls-3.6.7-win32-vs-support.patch"
bash -c "%PATCH_CMD% %UNIXPATH%gnutls/read-file-limits.h.patch"
cd %SRC%
This diff is collapsed.
This diff is collapsed.
--- gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in.orig 2015-04-09 23:38:42.018400000 +0300
+++ gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in 2015-04-09 23:39:31.860400000 +0300
@@ -67,6 +67,8 @@
#define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
#define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
+#define GNUTLS_INTERNAL_BUILD 1
+
#if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32)
# define _SYM_EXPORT __declspec(dllimport)
#else
\ No newline at end of file
set BUILD=%SRC%..\build
set ICONV_VERSION=73736371568e6976fa550c06d119fbbce7db8a15
set ICONV_VERSION=a4d13b43f8bfc328a9d1d326b0d748d5236613be
set ICONV_URL=https://github.com/ShiftMediaProject/libiconv/archive/%ICONV_VERSION%.tar.gz
mkdir %BUILD%
......
set BUILD=%SRC%..\build
set NETTLE_VERSION=55e0192040c8255386c23913b12555caa97d99b2
set NETTLE_VERSION=c180b4d7afbda4049ad265d1366567f62a7a4a3a
set NETTLE_URL=https://github.com/ShiftMediaProject/nettle/archive/%NETTLE_VERSION%.tar.gz
mkdir %BUILD%
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment