|
5308
|
1 This file is part of MXE. See LICENSE.md for licensing information. |
|
|
2 |
|
|
3 Contains ad hoc patches for cross building. |
|
|
4 |
|
|
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
|
6 From: Mark Brand <mabrand@mabrand.nl> |
|
|
7 Date: Sat, 15 Dec 2018 16:51:30 +0100 |
|
|
8 Subject: [PATCH 1/3] more tolerant parsing for mingw in host triplet |
|
|
9 |
|
|
10 |
|
|
11 diff --git a/src/mkheader.c b/src/mkheader.c |
|
|
12 index 1111111..2222222 100644 |
|
|
13 --- a/src/mkheader.c |
|
|
14 +++ b/src/mkheader.c |
|
|
15 @@ -602,7 +602,7 @@ write_special (const char *fname, int lnr, const char *tag) |
|
|
16 } |
|
|
17 else if (!strcmp (tag, "include:os-add")) |
|
|
18 { |
|
|
19 - if (!strcmp (host_os, "mingw32")) |
|
|
20 + if (strstr (host_os, "mingw")) |
|
|
21 { |
|
|
22 include_file (fname, lnr, "w32-add.h", write_line); |
|
|
23 } |
|
|
24 |
|
|
25 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
|
26 From: Tony Theodore <tonyt@logyst.com> |
|
|
27 Date: Wed, 6 Nov 2019 19:00:10 +1100 |
|
|
28 Subject: [PATCH 2/3] avoid whitespace in gpg-error.def linker script for |
|
|
29 mingw32 |
|
|
30 |
|
|
31 https://lists.gnupg.org/pipermail/gnupg-devel/2016-February/030798.html |
|
|
32 |
|
|
33 diff --git a/src/gpg-error.def.in b/src/gpg-error.def.in |
|
|
34 index 1111111..2222222 100644 |
|
|
35 --- a/src/gpg-error.def.in |
|
|
36 +++ b/src/gpg-error.def.in |
|
|
37 @@ -24,7 +24,6 @@ |
|
|
38 */ |
|
|
39 |
|
|
40 #include <config.h> |
|
|
41 - |
|
|
42 EXPORTS |
|
|
43 gpg_strerror @1 |
|
|
44 gpg_strerror_r @2 |
|
|
45 |
|
|
46 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
|
47 From: Tony Theodore <tonyt@logyst.com> |
|
|
48 Date: Wed, 6 Nov 2019 19:11:35 +1100 |
|
|
49 Subject: [PATCH 3/3] fix for automake < 1.12 |
|
|
50 |
|
|
51 |
|
|
52 diff --git a/configure.ac b/configure.ac |
|
|
53 index 1111111..2222222 100644 |
|
|
54 --- a/configure.ac |
|
|
55 +++ b/configure.ac |
|
|
56 @@ -62,9 +62,28 @@ VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x00" mym4_major mym4_minor) |
|
|
57 AC_SUBST(VERSION_NUMBER) |
|
|
58 |
|
|
59 AC_CONFIG_AUX_DIR([build-aux]) |
|
|
60 -AM_INIT_AUTOMAKE([serial-tests dist-bzip2]) |
|
|
61 AM_MAINTAINER_MODE |
|
|
62 AC_CONFIG_SRCDIR([src/err-sources.h.in]) |
|
|
63 + |
|
|
64 + |
|
|
65 +dnl Initialize automake. automake < 1.12 didn't have serial-tests and |
|
|
66 +dnl gives an error if it sees this, but for automake >= 1.13 |
|
|
67 +dnl serial-tests is required so we have to include it. Solution is to |
|
|
68 +dnl test for the version of automake (by running an external command) |
|
|
69 +dnl and provide it if necessary. Note we have to do this entirely using |
|
|
70 +dnl m4 macros since automake queries this macro by running |
|
|
71 +dnl 'autoconf --trace ...'. |
|
|
72 +m4_define([serial_tests], [ |
|
|
73 + m4_esyscmd([automake --version | |
|
|
74 + head -1 | |
|
|
75 + awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\ |
|
|
76 + 'print "serial-tests" }}' |
|
|
77 + ]) |
|
|
78 +]) |
|
|
79 +dnl NB: Do not [quote] this parameter. |
|
|
80 +AM_INIT_AUTOMAKE(serial_tests dist-bzip2) |
|
|
81 + |
|
|
82 + |
|
|
83 AC_CONFIG_HEADER([config.h]) |
|
|
84 AC_CONFIG_MACRO_DIR([m4]) |
|
|
85 AM_SILENT_RULES |
