diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2015-06-28 16:35:12 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2015-06-28 16:37:56 (GMT) |
| commit | 39c8fe01025a64af281178d4d2ecd6bd6c062e97 (patch) | |
| tree | 51b9f6785ea6e0eb20318d7a043bad0c4b95cc82 /src/libgcrypt-3-no-serial-tests.patch | |
| parent | 6e6c2ab143bb4b580474cc96ddf1f4fab2584eab (diff) | |
| download | mxe-39c8fe01025a64af281178d4d2ecd6bd6c062e97.zip mxe-39c8fe01025a64af281178d4d2ecd6bd6c062e97.tar.gz mxe-39c8fe01025a64af281178d4d2ecd6bd6c062e97.tar.bz2 | |
fix libgcrypt on x86_64 (automake < 1.12)
automake < 1.12 didn't have serial-tests and gives an error if
it sees this, but for automake >= 1.13 serial-tests is
required so we have to include it.
Solution is to test for the version of automake (by running an
external command) and provide serial-tests if necessary.
See #681
See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html
Diffstat (limited to 'src/libgcrypt-3-no-serial-tests.patch')
| -rw-r--r-- | src/libgcrypt-3-no-serial-tests.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/src/libgcrypt-3-no-serial-tests.patch b/src/libgcrypt-3-no-serial-tests.patch new file mode 100644 index 0000000..cde1d53 --- /dev/null +++ b/src/libgcrypt-3-no-serial-tests.patch @@ -0,0 +1,48 @@ +This file is part of MXE. +See index.html for further information. + +Fix libgcrypt build under x86_64 +See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html + +From e19ba5689148df7cdcb6c515f44a897cc3a08418 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sun, 28 Jun 2015 17:17:25 +0200 +Subject: [PATCH] configure.ac: no serial-tests if automake < 1.12 + +--- + configure.ac | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ab98441..a015787 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION + + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_SRCDIR([src/libgcrypt.vers]) +-AM_INIT_AUTOMAKE([serial-tests dist-bzip2]) ++ ++dnl Initialize automake. automake < 1.12 didn't have serial-tests and ++dnl gives an error if it sees this, but for automake >= 1.13 ++dnl serial-tests is required so we have to include it. Solution is to ++dnl test for the version of automake (by running an external command) ++dnl and provide it if necessary. Note we have to do this entirely using ++dnl m4 macros since automake queries this macro by running ++dnl 'autoconf --trace ...'. ++m4_define([serial_tests], [ ++ m4_esyscmd([automake --version | ++ head -1 | ++ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\ ++ 'print "serial-tests" }}' ++ ]) ++]) ++dnl NB: Do not [quote] this parameter. ++AM_INIT_AUTOMAKE(serial_tests dist-bzip2) ++ + AC_CONFIG_HEADER(config.h) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_LIBOBJ_DIR([compat]) +-- +1.7.10.4 + |