Mercurial > mxe-octave
annotate src/mingw-libgcrypt-1-fixes.patch @ 6264:3eae40f95cc3
qt5: update to v5.15.5
* src/qtbase.mk: update version, checksum
* src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk,
src/qttranslations.mk: update checksum
* src/qtbase-2-gcc11.patch: deleted
* dist-files.mk: remove ref to deleted file
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Mon, 20 Jun 2022 07:36:53 -0400 |
parents | e229031d9f6d |
children |
rev | line source |
---|---|
4313 | 1 This file is part of MXE. See LICENSE.md for licensing information. |
2 | |
3 Contains ad hoc patches for cross building. | |
4 | |
4996
3f3beb75a336
* src/mingw-libgcrypt-1-fixes.patch: update patch from mxe.cc
John Donoghue
parents:
4313
diff
changeset
|
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
4313 | 6 From: Tony Theodore <tonyt@logyst.com> |
7 Date: Thu, 4 Dec 2014 15:07:43 +1100 | |
6160
e229031d9f6d
* src/mingw-libgcrypt-1-fixes.patch: update patch
John Donoghue <john.donoghue@ieee.org>
parents:
5643
diff
changeset
|
8 Subject: [PATCH 1/1] fix for mingw cross building |
4313 | 9 |
10 Taken from: | |
11 https://aur.archlinux.org/packages/mingw-w64-libgcrypt/ | |
3685 | 12 |
4313 | 13 diff --git a/acinclude.m4 b/acinclude.m4 |
4996
3f3beb75a336
* src/mingw-libgcrypt-1-fixes.patch: update patch from mxe.cc
John Donoghue
parents:
4313
diff
changeset
|
14 index 1111111..2222222 100644 |
4313 | 15 --- a/acinclude.m4 |
16 +++ b/acinclude.m4 | |
17 @@ -102,7 +102,9 @@ AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE], | |
18 [tmp_do_check="no" | |
19 case "${host}" in | |
20 i?86-mingw32* | i?86-*-mingw32*) | |
21 - ac_cv_sys_symbol_underscore=yes | |
22 + if test "x$ac_cv_sys_symbol_underscore" = x ; then | |
23 + ac_cv_sys_symbol_underscore=yes | |
24 + fi | |
25 ;; | |
26 x86_64-*-mingw32*) | |
27 ac_cv_sys_symbol_underscore=no | |
28 diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h | |
4996
3f3beb75a336
* src/mingw-libgcrypt-1-fixes.patch: update patch from mxe.cc
John Donoghue
parents:
4313
diff
changeset
|
29 index 1111111..2222222 100644 |
4313 | 30 --- a/mpi/generic/mpi-asm-defs.h |
31 +++ b/mpi/generic/mpi-asm-defs.h | |
32 @@ -4,5 +4,9 @@ | |
33 #if __GNUC__ >= 3 && defined(__x86_64__) && defined(__ILP32__) | |
34 #define BYTES_PER_MPI_LIMB 8 | |
35 #else | |
36 +#ifdef _WIN64 | |
37 +#define BYTES_PER_MPI_LIMB (SIZEOF_UNSIGNED_LONG_LONG) | |
38 +#else | |
39 #define BYTES_PER_MPI_LIMB (SIZEOF_UNSIGNED_LONG) | |
40 #endif | |
41 +#endif | |
42 diff --git a/src/libgcrypt.def b/src/libgcrypt.def | |
4996
3f3beb75a336
* src/mingw-libgcrypt-1-fixes.patch: update patch from mxe.cc
John Donoghue
parents:
4313
diff
changeset
|
43 index 1111111..2222222 100644 |
4313 | 44 --- a/src/libgcrypt.def |
45 +++ b/src/libgcrypt.def | |
46 @@ -1,3 +1,4 @@ | |
47 +EXPORTS | |
48 ;; libgcrypt.defs - Exported symbols for W32 | |
49 ;; Copyright (C) 2003, 2007 Free Software Foundation, Inc. | |
50 ;; | |
51 @@ -22,7 +23,6 @@ | |
52 ;; never be changed. Also check libgcrypt.vers and visibility.h. | |
53 | |
54 | |
55 -EXPORTS | |
56 gcry_check_version @1 | |
57 gcry_control @2 | |
58 |