[arch-commits] Commit in io/trunk (PATCH-Fix-for-inlining-in-C11-mode.patch PKGBUILD)

[Johannes Löthberg]

    Date: Tuesday, February 2, 2016 @ 22:30:09
  Author: demize
Revision: 160031

upgpkg: io 2015.11.11-1

Requires an inlining fix patch since GCC 5 switched to C11

Added:
  io/trunk/PATCH-Fix-for-inlining-in-C11-mode.patch
Modified:
  io/trunk/PKGBUILD

------------------------------------------+
 PATCH-Fix-for-inlining-in-C11-mode.patch |   57 +++++++++++++++++++++++++++++
 PKGBUILD                                 |   11 ++++-
 2 files changed, 66 insertions(+), 2 deletions(-)

Added: PATCH-Fix-for-inlining-in-C11-mode.patch
===================================================================
--- PATCH-Fix-for-inlining-in-C11-mode.patch	                        (rev 0)
+++ PATCH-Fix-for-inlining-in-C11-mode.patch	2016-02-02 21:30:09 UTC (rev 160031)
@@ -0,0 +1,57 @@
+From 2ab9505240c7d32ea5cb4d367c86af0146ac0b7c Mon Sep 17 00:00:00 2001
+From: Peter Hull <peterhull90 at gmail.com>
+Date: Sun, 24 Jan 2016 13:19:27 +0000
+Subject: [PATCH] Fix for inlining in C11 mode
+
+---
+ libs/basekit/source/Common_inline.h | 36 ++++++++++++++++++++++++------------
+ 1 file changed, 24 insertions(+), 12 deletions(-)
+
+diff --git a/libs/basekit/source/Common_inline.h b/libs/basekit/source/Common_inline.h
+index a4086d7..19f8d47 100755
+--- a/libs/basekit/source/Common_inline.h
++++ b/libs/basekit/source/Common_inline.h
+@@ -117,19 +117,31 @@ Kudos to Daniel A. Koepke
+ 	#endif 
+ 	
+ #elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
+-
+-	#ifdef IO_IN_C_FILE
+-		// in .c 
+-		#define IO_DECLARE_INLINES
+-		#define IOINLINE inline
+-		#define IOINLINE_RECURSIVE inline
++	#ifdef __GNUC_STDC_INLINE__
++		#ifdef IO_IN_C_FILE
++			// in .c
++			#define IO_DECLARE_INLINES
++			#define IOINLINE
++			#define IOINLINE_RECURSIVE
++		#else
++			// in .h
++			#define IO_DECLARE_INLINES
++			#define IOINLINE inline
++			#define IOINLINE_RECURSIVE inline
++		#endif
+ 	#else
+-		// in .h 
+-		#define IO_DECLARE_INLINES
+-		#define IOINLINE extern inline
+-		#define IOINLINE_RECURSIVE extern inline
+-	#endif 
+-	
++		#ifdef IO_IN_C_FILE
++			// in .c
++			#define IO_DECLARE_INLINES
++			#define IOINLINE inline
++			#define IOINLINE_RECURSIVE inline
++		#else
++			// in .h
++			#define IO_DECLARE_INLINES
++			#define IOINLINE extern inline
++			#define IOINLINE_RECURSIVE extern inline
++		#endif
++	#endif
+ #else
+ 
+ 	#ifdef IO_IN_C_FILE

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-02 21:12:59 UTC (rev 160030)
+++ PKGBUILD	2016-02-02 21:30:09 UTC (rev 160031)
@@ -12,9 +12,16 @@
 depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff' 'libevent' 'yajl' 'libmysqlclient' 'lzo' 'libpng' 'python2' 'util-linux' 'freeglut' 'libjpeg-turbo' 'libtheora')
 makedepends=('cmake' 'git')
 options=('!makeflags' '!buildflags')
-source=("git://github.com/stevedekorte/io#tag=$pkgver")
-md5sums=('SKIP')
+source=("git://github.com/stevedekorte/io#tag=$pkgver"
+        PATCH-Fix-for-inlining-in-C11-mode.patch)
+md5sums=('SKIP'
+         'a3bab046cbc4be88ec95bb22c28abab3')
 
+prepare() {
+  cd io
+  git am ../PATCH-Fix-for-inlining-in-C11-mode.patch
+}
+
 build() {
   cd io
   sed -i "s:20140919:${pkgver//./}:" libs/iovm/source/IoVersion.h