From 6d9272f9b20ad77d40a233e8322fe19bbfd4d47d Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Mon, 12 Sep 2011 04:34:29 +0000
Subject: Patch up gcc/c99 inline mess

---
 archivers/gcpio/distinfo                           |  3 ++-
 archivers/gcpio/patches/patch-lib_argp_fmtstream_h | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 archivers/gcpio/patches/patch-lib_argp_fmtstream_h

(limited to 'archivers/gcpio')

diff --git a/archivers/gcpio/distinfo b/archivers/gcpio/distinfo
index 4ccc5e56a6f..78c6be35c17 100644
--- a/archivers/gcpio/distinfo
+++ b/archivers/gcpio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2010/03/23 22:42:17 tez Exp $
+$NetBSD: distinfo,v 1.12 2011/09/12 04:34:29 dholland Exp $
 
 SHA1 (cpio-2.6.tar.gz) = 5a4ea156519909994fe05933dc823abcf07e3e21
 RMD160 (cpio-2.6.tar.gz) = 8246bdd08ab8727f9a8042d33ddfe3a6332476b8
@@ -16,3 +16,4 @@ SHA1 (patch-an) = 943fe81aba7846bd8349cc2e31ab9525e019e99f
 SHA1 (patch-ao) = 53c7b6bc1e00a0203665e12807b3388204f838c3
 SHA1 (patch-ap) = cf1ca21394e4e437e64fc83837e08b0aba26d41e
 SHA1 (patch-aq) = d1536000401bbe2d1d32833f5871242e3ba1ddf6
+SHA1 (patch-lib_argp_fmtstream_h) = 6f21a19b5ea5d2cd1d3ebe6d6740780c39655763
diff --git a/archivers/gcpio/patches/patch-lib_argp_fmtstream_h b/archivers/gcpio/patches/patch-lib_argp_fmtstream_h
new file mode 100644
index 00000000000..df0a256eae7
--- /dev/null
+++ b/archivers/gcpio/patches/patch-lib_argp_fmtstream_h
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_argp_fmtstream_h,v 1.1 2011/09/12 04:34:29 dholland Exp $
+
+Fix up gcc/c99 inline mess.
+
+--- lib/argp-fmtstream.h~	2003-10-04 12:28:07.000000000 +0000
++++ lib/argp-fmtstream.h
+@@ -206,7 +206,11 @@ extern int __argp_fmtstream_ensure (argp
+ #endif
+ 
+ #ifndef ARGP_FS_EI
++#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
+ #define ARGP_FS_EI extern inline
++#else
++#define ARGP_FS_EI inline
++#endif
+ #endif
+ 
+ ARGP_FS_EI size_t
-- 
cgit v1.2.3