Fixed libgcrypt mpi inline attributes

aferrero2707 · Jun 19, 2017 · 593d7b5 · 593d7b5
1 parent 3fb2b2d
commit 593d7b5
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/modulesets/gnome-external-deps-2.32.modules b/modulesets/gnome-external-deps-2.32.modules
@@ -406,6 +406,7 @@
             hash="sha256:496f907c5324de75367ec61c63bfeed1309ef0bc64845dc20b3597731abd9e40"
             md5sum="cc2017ad09b4543f8b3b5e9a53cfd89d" size="1148382">
       <patch file="libgcrypt-1.4.5-ImplicitDSOLinking.patch" strip="1"/>
+      <patch file="libgcrypt-1.4.5-fix-mpi-inline-attr.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libgpg-error" />

diff --git a/modulesets/patches/libgcrypt-1.4.5-fix-mpi-inline-attr.patch b/modulesets/patches/libgcrypt-1.4.5-fix-mpi-inline-attr.patch
@@ -0,0 +1,24 @@
+*** libgcrypt-1.4.5/mpi/mpi-inline.h	2009-04-02 11:25:32.000000000 +0200
+--- libgcrypt-1.4.5-new/mpi/mpi-inline.h	2017-06-19 15:33:19.139517989 +0200
+***************
+*** 29,34 ****
+  #define G10_MPI_INLINE_H
+
+  #ifndef G10_MPI_INLINE_DECL
+! #define G10_MPI_INLINE_DECL  extern __inline__
+  #endif
+
+--- 29,41 ----
+  #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
+! # ifdef __GNUC_STDC_INLINE__
+! #  define G10_MPI_INLINE_DECL  extern inline __attribute__ ((__gnu_inline__))
+! # else
+! #  define G10_MPI_INLINE_DECL  extern __inline__
+! # endif
+  #endif
+