From ffd50de28063a63eb134038fe5b1028d085ed347 Mon Sep 17 00:00:00 2001
From: Juergen Buchmueller <pullmoll@t-online.de>
Date: Tue, 27 Sep 2016 09:23:45 +0200
Subject: [PATCH] argp-standalone: fix gcc6 build

Disable inlining of (some) functions which is problematic with gcc6
due to how argp-namefrob.h redefines already defined function names
with macros.
---
 .../patches/fix-no_use_inline.patch           | 32 +++++++++++++++++++
 srcpkgs/argp-standalone/template              |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/argp-standalone/patches/fix-no_use_inline.patch

diff --git a/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch b/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch
new file mode 100644
index 00000000000..a76bba8000f
--- /dev/null
+++ b/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch
@@ -0,0 +1,32 @@
+Effectively disable inlining of functions which are defined
+in argp-fmtstream.c because of name space conflicts when
+including argp-namefrob.h
+
+--- argp-fmtstream.h	2003-12-11 09:37:05.000000000 +0100
++++ argp-fmtstream.h	2016-09-27 09:19:48.891000000 +0200
+@@ -192,6 +192,7 @@
+ extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+ 
++#ifdef ARGP_USE_INLINE
+ #ifdef __OPTIMIZE__
+ /* Inline versions of above routines.  */
+ 
+@@ -208,7 +209,7 @@
+ #endif
+ 
+ #ifndef ARGP_FS_EI
+-#define ARGP_FS_EI extern inline
++#define ARGP_FS_EI static inline
+ #endif
+ 
+ ARGP_FS_EI size_t
+@@ -306,6 +307,8 @@
+ 
+ #endif /* __OPTIMIZE__ */
+ 
++#endif /* ARGP_USE_INLINE */
++
+ #endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
+ 
+ #endif /* argp-fmtstream.h */
diff --git a/srcpkgs/argp-standalone/template b/srcpkgs/argp-standalone/template
index a47672c8e18..44eee7e10b7 100644
--- a/srcpkgs/argp-standalone/template
+++ b/srcpkgs/argp-standalone/template
@@ -1,7 +1,7 @@
 # Template file for 'argp-standalone'
 pkgname=argp-standalone
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Implementation of ARGP"
 maintainer="John Regan <john@jrjrtech.com>"