depends: drop custom libgcrypt patch in favor of their upstream fix

Fixes Linux build (fvisibility=hidden)

Note: since this is an upstream patch, it can be dropped when we bump to
 >= 1.5.0

3 files changed, 43 insertions, 54 deletions

diff --git a/tools/depends/target/libgcrypt/01-inline-gcc.patch b/tools/depends/target/libgcrypt/01-inline-gcc.patch
new file mode 100644
index 0000000000..3a0fe015ac
--- /dev/null
+++ b/tools/depends/target/libgcrypt/01-inline-gcc.patch
@@ -0,0 +1,42 @@
+From 5abc06114e91beca0177331e1c79815f5fb6d7be Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Thu, 8 Nov 2012 15:38:44 +0100
+Subject: [PATCH] Fix extern inline use for gcc > 4.3 in c99 mode
+
+* mpi/mpi-inline.h [!G10_MPI_INLINE_DECL]: Take care of changed extern
+inline semantics in gcc.
+--
+
+I am not use how this will work out with non-gcc. However, we had no
+problems in the past and thus this change is the least invasive for
+non-gcc compilers.
+
+GnuPG-bug-id: 1406, 1435
+---
+ mpi/mpi-inline.h |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h
+index 88d9f56..94e2aec 100644
+--- a/mpi/mpi-inline.h
++++ b/mpi/mpi-inline.h
+@@ -28,8 +28,15 @@
+ #ifndef G10_MPI_INLINE_H
+ #define G10_MPI_INLINE_H
+ 
++/* Starting with gcc 4.3 "extern inline" conforms in c99 mode to the
++   c99 semantics.  To keep the useful old semantics we use an
++   attribute.  */
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern __inline__
++# ifdef __GNUC_STDC_INLINE__
++#  define G10_MPI_INLINE_DECL  extern inline __attribute__ ((__gnu_inline__))
++# else
++#  define G10_MPI_INLINE_DECL  extern __inline__
++# endif
+ #endif
+ 
+ G10_MPI_INLINE_DECL  mpi_limb_t
+-- 
+1.7.2.5
+
diff --git a/tools/depends/target/libgcrypt/01-static-mpi_mpi-internal.patch b/tools/depends/target/libgcrypt/01-static-mpi_mpi-internal.patch
deleted file mode 100644
index 5a1f60f8d6..0000000000
--- a/tools/depends/target/libgcrypt/01-static-mpi_mpi-internal.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-*** mpi/mpi-internal.h	Sun May  6 17:39:56 2012
---- mpi/mpi-internal_new.h	Sun May  6 17:45:59 2012
-*************** void _gcry_mpi_lshift_limbs( gcry_mpi_t 
-*** 183,206 ****
-  
-  
-  /*-- mpih-add.c --*/
-! 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_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);
-! 
-  /*-- mpih-sub.c --*/
-! 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_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);
-! 
-  /*-- mpih-cmp.c --*/
-! int _gcry_mpih_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size );
-! 
-  /*-- mpih-mul.c --*/
-  
-  struct karatsuba_ctx {
---- 183,206 ----
-  
-  
-  /*-- mpih-add.c --*/
-! static 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);
-! static 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);
-!  
-  /*-- mpih-sub.c --*/
-! static 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);
-! static 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);
-!  
-  /*-- mpih-cmp.c --*/
-! static int _gcry_mpih_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size );
-!  
-  /*-- mpih-mul.c --*/
-  
-  struct karatsuba_ctx {
diff --git a/tools/depends/target/libgcrypt/Makefile b/tools/depends/target/libgcrypt/Makefile
index e4e121fb60..3e21bd5f7d 100644
--- a/tools/depends/target/libgcrypt/Makefile
+++ b/tools/depends/target/libgcrypt/Makefile
@@ -27,7 +27,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p0 < ../01-static-mpi_mpi-internal.patch 
+	cd $(PLATFORM); patch -p1 < ../01-inline-gcc.patch
 	cd $(PLATFORM); patch -p0 < ../02-armasm.patch
 	cd $(PLATFORM); patch -p0 < ../03-gcrypt-android-select.patch
 	cd $(PLATFORM); patch -p0 < ../04-oflagmunging.patch