Mercurial > mxe-octave

changeset 4996:3f3beb75a336

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/mingw-libgcrypt-1-fixes.patch: update patch from mxe.cc
author John Donoghue
date Mon, 04 Mar 2019 12:12:12 -0500
parents b203c57d51ac
children 97fc509bb1df
files src/mingw-libgcrypt-1-fixes.patch
diffstat 1 files changed, 9 insertions(+), 86 deletions(-) [+]
line wrap: on
line diff
--- a/src/mingw-libgcrypt-1-fixes.patch	Sat Feb 23 11:40:42 2019 +0100
+++ b/src/mingw-libgcrypt-1-fixes.patch	Mon Mar 04 12:12:12 2019 -0500
@@ -2,7 +2,7 @@
 
 Contains ad hoc patches for cross building.
 
-From 6e118d36f8c15474065fe357446cf288cdc1e179 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 4 Dec 2014 15:07:43 +1100
 Subject: [PATCH 1/3] fix for mingw cross building
@@ -11,7 +11,7 @@
 https://aur.archlinux.org/packages/mingw-w64-libgcrypt/
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index 96be833..9e14e12 100644
+index 1111111..2222222 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -102,7 +102,9 @@ AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE],
@@ -26,7 +26,7 @@
      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
+index 1111111..2222222 100644
 --- a/mpi/generic/mpi-asm-defs.h
 +++ b/mpi/generic/mpi-asm-defs.h
 @@ -4,5 +4,9 @@
@@ -39,76 +39,8 @@
  #define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
  #endif
 +#endif
-diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
-index 898ca47..afd1a1f 100644
---- a/mpi/mpi-internal.h
-+++ b/mpi/mpi-internal.h
-@@ -169,6 +169,12 @@ typedef int mpi_size_t;        /* (must be a signed type) */
-     } while (0)
- 
- 
-+#ifdef _WIN64
-+#define ATTR_ABI __attribute__ ((sysv_abi))
-+#else
-+#define ATTR_ABI
-+#endif
-+
- /*-- mpiutil.c --*/
- #define mpi_alloc_limb_space(n,f)  _gcry_mpi_alloc_limb_space((n),(f))
- mpi_ptr_t _gcry_mpi_alloc_limb_space( unsigned nlimbs, int sec );
-@@ -187,7 +193,7 @@ void _gcry_mpi_lshift_limbs( gcry_mpi_t a, unsigned int count );
- mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
- 			 mpi_size_t s1_size, mpi_limb_t s2_limb );
- mpi_limb_t _gcry_mpih_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
--			  mpi_ptr_t s2_ptr,  mpi_size_t size);
-+			  mpi_ptr_t s2_ptr,  mpi_size_t size) ATTR_ABI;
- mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
- 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
- 
-@@ -195,7 +201,7 @@ mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_siz
- mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
- 			  mpi_size_t s1_size, mpi_limb_t s2_limb );
- mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
--			  mpi_ptr_t s2_ptr, mpi_size_t size);
-+			  mpi_ptr_t s2_ptr, mpi_size_t size) ATTR_ABI;
- mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
- 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
- 
-@@ -217,9 +223,9 @@ struct karatsuba_ctx {
- void _gcry_mpih_release_karatsuba_ctx( struct karatsuba_ctx *ctx );
- 
- mpi_limb_t _gcry_mpih_addmul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
--			     mpi_size_t s1_size, mpi_limb_t s2_limb);
-+			     mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
- mpi_limb_t _gcry_mpih_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
--			     mpi_size_t s1_size, mpi_limb_t s2_limb);
-+			     mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
- void _gcry_mpih_mul_n( mpi_ptr_t prodp, mpi_ptr_t up, mpi_ptr_t vp,
- 						   mpi_size_t size);
- mpi_limb_t _gcry_mpih_mul( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,
-@@ -236,7 +242,7 @@ void _gcry_mpih_mul_karatsuba_case( mpi_ptr_t prodp,
- 
- /*-- mpih-mul_1.c (or xxx/cpu/ *.S) --*/
- mpi_limb_t _gcry_mpih_mul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
--			  mpi_size_t s1_size, mpi_limb_t s2_limb);
-+			  mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
- 
- /*-- mpih-div.c --*/
- mpi_limb_t _gcry_mpih_mod_1(mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
-@@ -250,9 +256,9 @@ mpi_limb_t _gcry_mpih_divmod_1( mpi_ptr_t quot_ptr,
- 
- /*-- mpih-shift.c --*/
- mpi_limb_t _gcry_mpih_lshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
--							   unsigned cnt);
-+							   unsigned cnt) ATTR_ABI;
- mpi_limb_t _gcry_mpih_rshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
--							   unsigned cnt);
-+							   unsigned cnt) ATTR_ABI;
- 
- 
- /* Define stuff for longlong.h.  */
 diff --git a/src/libgcrypt.def b/src/libgcrypt.def
-index 067cb84..df71bba 100644
+index 1111111..2222222 100644
 --- a/src/libgcrypt.def
 +++ b/src/libgcrypt.def
 @@ -1,3 +1,4 @@
@@ -124,21 +56,18 @@
        gcry_check_version  @1
        gcry_control  @2
  
--- 
-2.7.4
 
-
-From 9ff9c0ae66b9f51decfda8dffa2024d8dbaa9fe6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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
+index 1111111..2222222 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [0])
+@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [1])
  # processing is done by autoconf and not during the configure run.
  m4_define(mym4_version,
            [mym4_version_major.mym4_version_minor.mym4_version_micro])
@@ -154,11 +83,8 @@
  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 0000000000000000000000000000000000000000 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
@@ -174,7 +100,7 @@
 See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html
 
 diff --git a/configure.ac b/configure.ac
-index d43c012..b6f20ae 100644
+index 1111111..2222222 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION
@@ -203,6 +129,3 @@
  AC_CONFIG_HEADER(config.h)
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_LIBOBJ_DIR([compat])
--- 
-2.7.4
-