mirror of https://git.wownero.com/dsc/mxe.git
libgcrypt: update
This commit is contained in:
Mark Brand
parent
6580c1553f
commit
6c01e8a366
|
|
@ -3,28 +3,29 @@ See index.html for further information.
|
|||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 51d564de8fec65610977732baf46987db3dd2f1c Mon Sep 17 00:00:00 2001
|
||||
From: MXE
|
||||
From 6e118d36f8c15474065fe357446cf288cdc1e179 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Thu, 4 Dec 2014 15:07:43 +1100
|
||||
Subject: [PATCH] Taken from:
|
||||
Subject: [PATCH 1/3] fix for mingw cross building
|
||||
|
||||
Taken from:
|
||||
https://aur.archlinux.org/packages/mingw-w64-libgcrypt/
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index 0791b84..b520db1 100644
|
||||
index 96be833..9e14e12 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -102,7 +102,9 @@ AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE],
|
||||
[tmp_do_check="no"
|
||||
case "${host}" in
|
||||
*-mingw32*)
|
||||
i?86-mingw32* | i?86-*-mingw32*)
|
||||
- ac_cv_sys_symbol_underscore=yes
|
||||
+ if test "x$ac_cv_sys_symbol_underscore" = x ; then
|
||||
+ ac_cv_sys_symbol_underscore=yes
|
||||
+ fi
|
||||
;;
|
||||
i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
|
||||
ac_cv_sys_symbol_underscore=yes
|
||||
x86_64-*-mingw32*)
|
||||
ac_cv_sys_symbol_underscore=no
|
||||
diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h
|
||||
index e607806..4c57111 100644
|
||||
--- a/mpi/generic/mpi-asm-defs.h
|
||||
|
|
@ -108,7 +109,7 @@ index 898ca47..afd1a1f 100644
|
|||
|
||||
/* Define stuff for longlong.h. */
|
||||
diff --git a/src/libgcrypt.def b/src/libgcrypt.def
|
||||
index a90efce..b5f476d 100644
|
||||
index 067cb84..df71bba 100644
|
||||
--- a/src/libgcrypt.def
|
||||
+++ b/src/libgcrypt.def
|
||||
@@ -1,3 +1,4 @@
|
||||
|
|
@ -125,5 +126,84 @@ index a90efce..b5f476d 100644
|
|||
gcry_control @2
|
||||
|
||||
--
|
||||
1.9.3 (Apple Git-50)
|
||||
2.7.4
|
||||
|
||||
|
||||
From 9ff9c0ae66b9f51decfda8dffa2024d8dbaa9fe6 Mon Sep 17 00:00:00 2001
|
||||
From: Saikrishna Arcot <saiarcot895@gmail.com>
|
||||
Date: Fri, 12 Jun 2015 14:53:55 -0700
|
||||
Subject: [PATCH 2/3] Don't call git to determine the revision.
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f683e21..d43c012 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [0])
|
||||
# processing is done by autoconf and not during the configure run.
|
||||
m4_define(mym4_version,
|
||||
[mym4_version_major.mym4_version_minor.mym4_version_micro])
|
||||
-m4_define([mym4_revision],
|
||||
- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
|
||||
+m4_define([mym4_revision], [4091])
|
||||
m4_define([mym4_revision_dec],
|
||||
m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
|
||||
-m4_define([mym4_betastring],
|
||||
- m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\
|
||||
- awk -F- '$3!=0{print"-beta"$3}']))
|
||||
+m4_define([mym4_betastring], [])
|
||||
m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
|
||||
m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
From 7a22846e84ca5047b2f5cae7eb12ccab53c03026 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Sun, 28 Jun 2015 17:17:25 +0200
|
||||
Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12
|
||||
|
||||
Earlier versions of automake complain if they get a configuration
|
||||
parameter which they don't understand. The error is:
|
||||
|
||||
configure.ac:27: error: option 'serial-tests' not recognized
|
||||
|
||||
Use some m4 hackery to work around this.
|
||||
|
||||
Fix libgcrypt build under x86_64
|
||||
See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d43c012..b6f20ae 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])
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From bb6a01f7a13be69e9ba395977dacd2ac0b9efbcd Mon Sep 17 00:00:00 2001
|
||||
From: MXE
|
||||
Date: Fri, 12 Jun 2015 14:53:55 -0700
|
||||
Subject: [PATCH] Don't call git to determine the revision.
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d9a1670..ab98441 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [3])
|
||||
# processing is done by autoconf and not during the configure run.
|
||||
m4_define(mym4_version,
|
||||
[mym4_version_major.mym4_version_minor.mym4_version_micro])
|
||||
-m4_define([mym4_revision],
|
||||
- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
|
||||
+m4_define([mym4_revision], [4091])
|
||||
m4_define([mym4_revision_dec],
|
||||
m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
|
||||
-m4_define([mym4_betastring],
|
||||
- m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\
|
||||
- awk -F- '$3!=0{print"-beta"$3}']))
|
||||
+m4_define([mym4_betastring], [])
|
||||
m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
|
||||
m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := libgcrypt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.6.5
|
||||
$(PKG)_CHECKSUM := f49ebc5842d455ae7019def33eb5a014a0f07a2a8353dc3aa50a76fd1dafa924
|
||||
$(PKG)_VERSION := 1.7.0
|
||||
$(PKG)_CHECKSUM := b0e67ea74474939913c4d9d9ef4ef5ec378efbe2bebe36389dee319c79bffa92
|
||||
$(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2
|
||||
$(PKG)_URL := http://mirrors.dotsrc.org/gcrypt/libgcrypt/$($(PKG)_FILE)
|
||||
|
|
|
|||
Loading…
Reference in New Issue