summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-07-03 18:22:08 +0000
committerjoerg <joerg@pkgsrc.org>2012-07-03 18:22:08 +0000
commite844cf87f286932175bc7ec088894a5eddd16414 (patch)
tree6b33e5930fcf591677f06ccd11885fc65c2ff5a8 /archivers
parentbdfa864ec533cfc264cee73f90d1f20bd7ea0921 (diff)
downloadpkgsrc-e844cf87f286932175bc7ec088894a5eddd16414.tar.gz
Really fix inline mess.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/gcpio/distinfo4
-rw-r--r--archivers/gcpio/patches/patch-lib_argp_fmtstream_h38
2 files changed, 37 insertions, 5 deletions
diff --git a/archivers/gcpio/distinfo b/archivers/gcpio/distinfo
index 78c6be35c17..c48c451aa70 100644
--- a/archivers/gcpio/distinfo
+++ b/archivers/gcpio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/09/12 04:34:29 dholland Exp $
+$NetBSD: distinfo,v 1.13 2012/07/03 18:22:08 joerg Exp $
SHA1 (cpio-2.6.tar.gz) = 5a4ea156519909994fe05933dc823abcf07e3e21
RMD160 (cpio-2.6.tar.gz) = 8246bdd08ab8727f9a8042d33ddfe3a6332476b8
@@ -16,4 +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
+SHA1 (patch-lib_argp_fmtstream_h) = 10e997a11d06cafd66e9644f69db61fef62097a9
diff --git a/archivers/gcpio/patches/patch-lib_argp_fmtstream_h b/archivers/gcpio/patches/patch-lib_argp_fmtstream_h
index df0a256eae7..6a2d9779196 100644
--- a/archivers/gcpio/patches/patch-lib_argp_fmtstream_h
+++ b/archivers/gcpio/patches/patch-lib_argp_fmtstream_h
@@ -1,10 +1,42 @@
-$NetBSD: patch-lib_argp_fmtstream_h,v 1.1 2011/09/12 04:34:29 dholland Exp $
+$NetBSD: patch-lib_argp_fmtstream_h,v 1.2 2012/07/03 18:22:08 joerg Exp $
Fix up gcc/c99 inline mess.
---- lib/argp-fmtstream.h~ 2003-10-04 12:28:07.000000000 +0000
+--- lib/argp-fmtstream.h.orig 2003-10-04 12:28:07.000000000 +0000
+++ lib/argp-fmtstream.h
-@@ -206,7 +206,11 @@ extern int __argp_fmtstream_ensure (argp
+@@ -143,6 +143,7 @@ extern ssize_t argp_fmtstream_printf (ar
+ __const char *__fmt, ...)
+ __attribute__ ((__format__ (printf, 2, 3)));
+
++#if 0
+ extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+ extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+
+@@ -153,6 +154,7 @@ extern size_t __argp_fmtstream_write (ar
+ __const char *__str, size_t __len);
+ extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
+ __const char *__str, size_t __len);
++#endif
+
+ /* Access macros for various bits of state. */
+ #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
+@@ -162,6 +164,7 @@ extern size_t argp_fmtstream_write (argp
+ #define __argp_fmtstream_rmargin argp_fmtstream_rmargin
+ #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
+
++#if 0
+ /* Set __FS's left margin to LMARGIN and return the old value. */
+ extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
+ size_t __lmargin);
+@@ -183,6 +186,7 @@ extern size_t __argp_fmtstream_set_wmarg
+ /* Return the column number of the current output point in __FS. */
+ extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
+ extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
++#endif
+
+ /* Internal routines. */
+ extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
+@@ -206,7 +210,11 @@ extern int __argp_fmtstream_ensure (argp
#endif
#ifndef ARGP_FS_EI