Mercurial > mxe-octave

comparison src/mingw-libgcrypt-1-fixes.patch @ 6160:e229031d9f6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/mingw-libgcrypt-1-fixes.patch: update patch
author John Donoghue <john.donoghue@ieee.org>
date Thu, 14 Apr 2022 09:33:04 -0400
parents aa9f810ee050
children
comparison
equal deleted inserted replaced
6159:d6bc95d7c6af 6160:e229031d9f6d
3 Contains ad hoc patches for cross building. 3 Contains ad hoc patches for cross building.
4 4
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6 From: Tony Theodore <tonyt@logyst.com> 6 From: Tony Theodore <tonyt@logyst.com>
7 Date: Thu, 4 Dec 2014 15:07:43 +1100 7 Date: Thu, 4 Dec 2014 15:07:43 +1100
8 Subject: [PATCH 1/3] fix for mingw cross building 8 Subject: [PATCH 1/1] fix for mingw cross building
9 9
10 Taken from: 10 Taken from:
11 https://aur.archlinux.org/packages/mingw-w64-libgcrypt/ 11 https://aur.archlinux.org/packages/mingw-w64-libgcrypt/
12 12
13 diff --git a/acinclude.m4 b/acinclude.m4 13 diff --git a/acinclude.m4 b/acinclude.m4
54 54
55 -EXPORTS 55 -EXPORTS
56 gcry_check_version @1 56 gcry_check_version @1
57 gcry_control @2 57 gcry_control @2
58 58
59
60 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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
76 index 1111111..2222222 100644
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])