Mercurial > mxe-octave
annotate src/mingw-libgcrypt-1-fixes.patch @ 6213:5f64fb928091 release
build-gcc: Avoid library clash when calling msgfmt.
* src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when
calling `msgfmt`.
* dist-files.mk: Add patch to list.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 06 May 2022 19:36:10 +0200 |
| parents | aa9f810ee050 |
| children | e229031d9f6d |
| 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 | |
| 8 Subject: [PATCH 1/3] fix for mingw cross building | |
| 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 | |
| 59 | |
|
4996
3f3beb75a336
* src/mingw-libgcrypt-1-fixes.patch: update patch from mxe.cc
John Donoghue
parents:
4313
diff
changeset
|
60 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 4313 | 61 From: "Richard W.M. Jones" <rjones@redhat.com> |
| 62 Date: Sun, 28 Jun 2015 17:17:25 +0200 | |
| 63 Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12 | |
| 64 | |
| 65 Earlier versions of automake complain if they get a configuration | |
| 66 parameter which they don't understand. The error is: | |
| 67 | |
| 68 configure.ac:27: error: option 'serial-tests' not recognized | |
| 69 | |
| 70 Use some m4 hackery to work around this. | |
| 71 | |
| 72 Fix libgcrypt build under x86_64 | |
| 73 See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html | |
| 74 | |
| 75 diff --git a/configure.ac b/configure.ac | |
|
4996
3f3beb75a336
* src/mingw-libgcrypt-1-fixes.patch: update patch from mxe.cc
John Donoghue
parents:
4313
diff
changeset
|
76 index 1111111..2222222 100644 |
| 4313 | 77 --- a/configure.ac |
| 78 +++ b/configure.ac | |
| 79 @@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION | |
| 80 | |
| 81 AC_CONFIG_AUX_DIR([build-aux]) | |
| 82 AC_CONFIG_SRCDIR([src/libgcrypt.vers]) | |
| 83 -AM_INIT_AUTOMAKE([serial-tests dist-bzip2]) | |
| 84 + | |
| 85 +dnl Initialize automake. automake < 1.12 didn't have serial-tests and | |
| 86 +dnl gives an error if it sees this, but for automake >= 1.13 | |
| 87 +dnl serial-tests is required so we have to include it. Solution is to | |
| 88 +dnl test for the version of automake (by running an external command) | |
| 89 +dnl and provide it if necessary. Note we have to do this entirely using | |
| 90 +dnl m4 macros since automake queries this macro by running | |
| 91 +dnl 'autoconf --trace ...'. | |
| 92 +m4_define([serial_tests], [ | |
| 93 + m4_esyscmd([automake --version | | |
| 94 + head -1 | | |
| 95 + awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\ | |
| 96 + 'print "serial-tests" }}' | |
| 97 + ]) | |
| 98 +]) | |
| 99 +dnl NB: Do not [quote] this parameter. | |
| 100 +AM_INIT_AUTOMAKE(serial_tests dist-bzip2) | |
| 101 + | |
| 102 AC_CONFIG_HEADER(config.h) | |
| 103 AC_CONFIG_MACRO_DIR([m4]) | |
| 104 AC_CONFIG_LIBOBJ_DIR([compat]) |