annotate src/mingw-libgcrypt-1-fixes.patch @ 4258:a45374f7d9a3

Use 8.3 format for octave path * installer-files/octave-firsttime.vbs: convert OctavePath to shortpath * installer-files/octave.vbs: convert OctavePath to shortpath * installer-files/octave.bat: convert OCT_HOME to 8.3 path * tools/makeinst-script.sh.in: call pkg rbuild and fc_cache with 8.3 pathname
author John D
date Tue, 06 Dec 2016 02:27:58 -0500
parents 0023c034ec4a
children 3d768e8ec06a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3685
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
1 From http://lists.freedesktop.org/archives/gstreamer-commits/2014-February/077094.html
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
2
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
3 diff -ur libgcrypt-1.6.1.orig/random/rndhw.c libgcrypt-1.6.1/random/rndhw.c
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
4 --- libgcrypt-1.6.1.orig/random/rndhw.c 2014-08-16 22:16:09.991066266 -0400
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
5 +++ libgcrypt-1.6.1/random/rndhw.c 2014-08-16 22:19:19.025936274 -0400
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
6 @@ -69,7 +69,7 @@
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
7 nbytes = 0;
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
8 while (nbytes < 64)
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
9 {
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
10 -#if defined(__x86_64__) && defined(__LP64__)
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
11 +#if defined(__x86_64__) // && defined(__LP64__)
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
12 asm volatile
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
13 ("movq %1, %%rdi\n\t" /* Set buffer. */
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
14 "xorq %%rdx, %%rdx\n\t" /* Request up to 8 bytes. */
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
15 @@ -123,7 +123,7 @@
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
16 #ifdef USE_DRNG
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
17 # define RDRAND_RETRY_LOOPS 10
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
18 # define RDRAND_INT ".byte 0x0f,0xc7,0xf0"
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
19 -# if defined(__x86_64__) && defined(__LP64__)
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
20 +# if defined(__x86_64__) //&& defined(__LP64__)
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
21 # define RDRAND_LONG ".byte 0x48,0x0f,0xc7,0xf0"
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
22 # else
2fe9db1b3f77 libgcrypt: add patch for mingw compile
John Donoghue
parents:
diff changeset
23 # define RDRAND_LONG RDRAND_INT